Index: /applications/editors/josm/i18n/po/ar.po
===================================================================
--- /applications/editors/josm/i18n/po/ar.po	(revision 21970)
+++ /applications/editors/josm/i18n/po/ar.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 21:04+0000\n"
+"POT-Creation-Date: 2010-06-23 22:47+0200\n"
+"PO-Revision-Date: 2010-06-15 17:42+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2010-06-15 16:22+0000\n"
+"X-Launchpad-Export-Date: 2010-06-23 20:25+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 "المعلومات"
@@ -586,6 +591,5 @@
 "The ways can not be combined in their current directions.  Do you want to "
 "reverse some of them?"
-msgstr ""
-"لا يمكن ضمّ الطرقات في إتجاهاتها الحالية. هل تريد عكس إتجاهات بعضها ؟"
+msgstr "لا يمكن ضمّ الطرقات في إتجاهاتها الحالية. هل تريد عكس إتجاهات بعضها ؟"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
@@ -646,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
@@ -659,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 "أحذف"
@@ -906,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 ""
@@ -914,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 ""
@@ -1461,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
@@ -1487,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
@@ -1493,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 "خطأ"
@@ -1604,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 ""
 
@@ -1639,8 +1646,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 +1658,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 +1665,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 ""
@@ -1673,13 +1688,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 +1706,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 +1719,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)"
@@ -1828,6 +1849,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 ""
 
@@ -1893,9 +1913,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)"
@@ -1912,5 +1932,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
@@ -1974,5 +1994,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 "لا يوجد تغييرات للتحميل."
@@ -1990,14 +2009,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 ""
@@ -2252,5 +2271,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
@@ -2365,6 +2384,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 ""
 
@@ -2492,5 +2511,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."
@@ -2606,6 +2625,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 ""
 
@@ -2867,10 +2886,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
@@ -2992,5 +3015,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
@@ -3068,7 +3091,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 ""
 
@@ -3114,11 +3137,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"
@@ -3127,5 +3150,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 #, java-format
 msgid ""
@@ -3134,5 +3157,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}"
@@ -3338,6 +3361,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 ""
 
@@ -3420,5 +3443,5 @@
 #. *
 #. * the decimal format 999.999
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3427,5 +3450,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3434,5 +3457,5 @@
 #. *
 #. * coordinates East/North
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3479,4 +3502,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}"
@@ -3488,29 +3514,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 ""
 
@@ -3589,19 +3609,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 ""
@@ -3610,5 +3630,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 "
@@ -3616,5 +3636,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 ""
@@ -3682,6 +3702,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 ""
 
@@ -3696,5 +3715,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 "مُنتقى"
@@ -3858,6 +3877,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 +3950,5 @@
 #. color tiger_data
 #. </rule>
-#. 
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -3940,5 +3958,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -3947,5 +3965,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -3954,5 +3972,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -3961,5 +3979,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -3968,5 +3986,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -3975,9 +3993,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--annotation tags -->
-#. 
+#.
 #. <!--"work in progress" tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="building"/>
@@ -3986,5 +4004,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 ""
@@ -4071,5 +4089,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
@@ -4289,5 +4307,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
@@ -4296,4 +4314,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
@@ -4493,5 +4512,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
@@ -4530,6 +4549,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 ""
 
@@ -4560,5 +4579,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"
@@ -4567,5 +4586,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"
@@ -4574,5 +4593,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"
@@ -4786,6 +4805,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 ""
 
@@ -4865,6 +4883,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 ""
 
@@ -4872,6 +4890,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 ""
 
@@ -4922,6 +4940,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 ""
 
@@ -5138,10 +5156,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"
@@ -5150,10 +5170,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
@@ -5235,4 +5257,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 ""
@@ -5453,7 +5476,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 ""
 
@@ -5478,6 +5501,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 ""
 
@@ -5523,5 +5545,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
@@ -5594,10 +5616,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 ""
 
@@ -5620,5 +5641,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
@@ -5626,5 +5647,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 "أضِف"
@@ -5673,5 +5694,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 "الخط الزمني"
@@ -5891,10 +5912,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 ""
@@ -7349,6 +7370,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 ""
 
@@ -7372,8 +7393,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 ""
 
@@ -7493,9 +7514,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."
@@ -7504,23 +7525,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 "<مختلف>"
 
-#: ../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 "غيّر القيم ؟"
 
-#: ../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 +7550,5 @@
 msgstr[1] ""
 
-#: ../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."
@@ -7536,77 +7557,77 @@
 msgstr[1] ""
 
-#: ../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 "الرجاء إختيار مفتاح"
 
-#: ../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 "الرجاء إختيار قيمة"
 
-#: ../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 "خصائص/عضويات"
 
-#: ../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 "خصائص الأغراض المختارة."
 
 #. 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 "الخصائص: {0} / العضويات: {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 "الخصائص/ العضويات"
 
-#: ../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 "غيّر العلاقة"
 
-#: ../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 "هل حقاً أمحي الخيار من العلاقة {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 "أمحي المفتاح المنتقى من كلّ الأغراض"
 
-#: ../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 "أضف زوج جديد مفتاح/قيمة إلى كلّ الأغراض"
 
-#: ../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 "حرّر المحتاح المنقى لكلّ الأغراض"
 
-#: ../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 ""
@@ -7721,6 +7742,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 ""
 
@@ -7738,6 +7759,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 ""
 
@@ -7892,7 +7913,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 ""
 
@@ -8224,7 +8244,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 ""
 
@@ -8365,6 +8384,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 ""
 
@@ -8374,6 +8393,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 ""
 
@@ -8647,9 +8666,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 ""
 
@@ -8664,8 +8682,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 ""
 
@@ -8716,6 +8733,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
 msgid "Provide a brief comment for the changes you are uploading:"
-msgstr ""
-"الرجاء التزويد ببعض الملاحظات في ما يخص التغييرات اللتي تريد إرسالها:"
+msgstr "الرجاء التزويد ببعض الملاحظات في ما يخص التغييرات اللتي تريد إرسالها:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
@@ -8912,5 +8928,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 ""
@@ -8918,6 +8934,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 ""
 
@@ -9002,6 +9017,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] ""
@@ -9015,6 +9030,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 "
@@ -9240,5 +9255,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9264,6 +9279,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 ""
 
@@ -9318,6 +9332,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 ""
 
@@ -9371,7 +9385,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 ""
 
@@ -9381,5 +9395,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9395,5 +9409,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..."
@@ -9404,6 +9418,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 ""
 
@@ -9621,7 +9634,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 ""
 
@@ -9647,7 +9660,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 ""
 
@@ -9711,9 +9724,9 @@
 #: ../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:"
-msgstr ""
-"<html>إنّ تحميل معطيات جهاز تحديد المواقع العالمي غير المعالجة مسبقاً قد "
-"تكون مضرة.<br>أنظر هنا إذا أردت تحميل بعض الأثرات:"
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>إنّ تحميل معطيات جهاز تحديد المواقع العالمي غير المعالجة مسبقاً قد تكون "
+"مضرة.<br>أنظر هنا إذا أردت تحميل بعض الأثرات:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
@@ -9888,6 +9901,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 ""
 
@@ -9955,7 +9968,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 ""
 
@@ -10530,6 +10543,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 ""
 
@@ -10551,8 +10564,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 ""
 
@@ -10672,6 +10685,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 ""
 
@@ -10781,6 +10794,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 ""
 
@@ -10914,8 +10926,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 ""
 
@@ -10998,8 +11010,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 ""
 
@@ -11026,7 +11038,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 ""
 
@@ -11077,5 +11089,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 ""
@@ -11428,6 +11440,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 ""
 "أرسم سهام الإتجاه حسب البحث في الجدول بدلاً عن إستعمال الرياضيات الصعبة."
@@ -11487,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 ""
 
@@ -11558,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 "تمكين الغيابيات المبيتة"
@@ -11576,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>:"
@@ -11700,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 ""
 
@@ -11712,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 ""
 
@@ -12012,6 +12021,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 ""
 
@@ -12022,5 +12031,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 ""
@@ -12030,18 +12039,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 ""
@@ -12050,5 +12059,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 ""
@@ -12057,5 +12066,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 ""
@@ -12064,9 +12073,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 ""
@@ -12175,6 +12184,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 ""
 
@@ -12196,6 +12205,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 ""
 
@@ -12273,6 +12282,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 ""
 
@@ -12288,6 +12296,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 ""
 
@@ -12381,6 +12388,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 ""
 
@@ -12517,4 +12524,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 "غيّر الخصائص"
@@ -12680,5 +12688,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
@@ -12698,5 +12706,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}''"
@@ -12861,6 +12869,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 ""
 
@@ -12977,10 +12984,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 ""
@@ -12988,69 +12995,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}."
@@ -13228,4 +13235,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})"
@@ -13245,6 +13253,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 ""
 
@@ -13272,6 +13280,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 ""
 
@@ -13313,6 +13321,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 ""
 
@@ -13746,6 +13753,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 ""
 
@@ -13951,6 +13958,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 ""
 
@@ -14017,5 +14023,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"
@@ -14098,6 +14104,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 ""
 
@@ -14105,7 +14111,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 ""
 
@@ -14113,7 +14119,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 ""
 
@@ -14121,8 +14127,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 ""
 
@@ -14142,7 +14148,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 ""
 
@@ -14211,7 +14217,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 ""
 
@@ -14223,7 +14228,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 ""
 
@@ -14255,6 +14260,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 ""
 
@@ -14758,6 +14763,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>"
@@ -14784,6 +14789,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"
@@ -14821,6 +14826,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"
@@ -14836,7 +14841,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"
@@ -14887,9 +14892,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 "مباني"
+
+#: ../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 "التفضيلات المتقدمة"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#, fuzzy
+msgid "Building tag:"
+msgstr "مبنى"
+
+#: ../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"
@@ -14898,35 +14922,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 "مبنى عام"
+
+#: ../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 ""
 
@@ -15101,7 +15134,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--waterway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15111,5 +15144,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15119,5 +15152,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15133,5 +15166,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15141,5 +15174,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15147,8 +15180,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 "الماء"
@@ -15170,5 +15203,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15177,5 +15210,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15184,5 +15217,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15191,5 +15224,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15198,5 +15231,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15205,10 +15238,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 "العنوان"
@@ -15237,11 +15270,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 ""
 
@@ -15667,6 +15699,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 ""
@@ -15849,4 +15881,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 "حرّر حديقة حيوانات"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#, fuzzy
+msgid "Name:"
+msgstr "الإسم"
+
+#: ../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 "هل أنت متأكد ؟"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
+#, fuzzy
+msgid "New tool..."
+msgstr "الدور الجديد"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
+#, fuzzy
+msgid "Install"
+msgstr "صناعي"
+
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
 msgid "Position only"
@@ -16113,5 +16192,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#. 
+#.
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16232,6 +16311,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 ""
 
@@ -16250,7 +16328,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 ""
 
@@ -16557,6 +16634,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 ""
 
@@ -16666,6 +16742,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 ""
 
@@ -16716,6 +16791,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 ""
 
@@ -17079,5 +17153,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}"
@@ -17127,4 +17201,40 @@
 #, java-format
 msgid "Revert changeset #{0}"
+msgstr ""
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:78
+msgid "Road Sign Plugin"
+msgstr ""
+
+#: ../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 "لم أتمكن من إعادة تسمية الوثيقة ''{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 "الخيار: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:111
+#, java-format
+msgid "Additional sign {0}"
 msgstr ""
 
@@ -17232,4 +17342,13 @@
 msgstr ""
 
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+msgid "Simplify Area"
+msgstr ""
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
+msgid "Delete unnecessary nodes from an area."
+msgstr ""
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
 msgid "Slippy Map"
@@ -18021,6 +18140,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 ""
 
@@ -18106,8 +18225,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 ""
 
@@ -18161,8 +18280,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 ""
 
@@ -18274,6 +18393,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 ""
 
@@ -18281,6 +18400,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 ""
 
@@ -18928,7 +19047,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 ""
 
@@ -19124,9 +19242,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 ""
@@ -19222,11 +19340,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 "إستورد صوت مسجل"
+
+#: ../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 "أزِل"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
+msgid "removes current video from layer"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
+#, fuzzy
+msgid "play/pause"
+msgstr "عزف\\مهلة"
+
+#: ../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 "الخلفية"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
+#, fuzzy
+msgid "jumps n sec back"
+msgstr "أقفظ رجوعاُ"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "forward"
+msgstr "مرّر"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "jumps n sec forward"
+msgstr "أقفظ إلى الأمام"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
+#, fuzzy
+msgid "faster"
+msgstr "أسرع"
+
+#: ../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 "أبطأ"
+
+#: ../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
+msgid "loops n sec around current position"
+msgstr ""
+
+#. 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
+#, fuzzy
+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
+#, fuzzy
+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 "الطبقة"
+
+#: ../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 ""
 
@@ -19439,28 +19690,28 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
 msgid "Automatic downloading"
 msgstr ""
 
-#: ../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 ""
@@ -19471,113 +19722,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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
 msgid "WMS Plugin Preferences"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -19593,4 +19844,8 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
 msgid "% of north:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186
+msgid "Simultaneous connections"
 msgstr ""
 
@@ -19603,7 +19858,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
@@ -19651,8 +19906,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 "غابة"
@@ -19669,7 +19924,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--boundary tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -19679,5 +19934,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -19720,5 +19975,5 @@
 #. color boundary
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -19728,5 +19983,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -19736,5 +19991,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -19744,15 +19999,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 "الحدود"
@@ -19768,5 +20023,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -19775,7 +20030,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--route tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -19785,5 +20040,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -19793,5 +20048,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -19801,5 +20056,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -19809,5 +20064,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -19817,5 +20072,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -19825,5 +20080,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -19833,12 +20088,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 "طريق"
@@ -20115,21 +20370,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 "
@@ -20139,10 +20393,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."
@@ -20150,5 +20404,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 "
@@ -20158,15 +20412,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 "
@@ -20175,5 +20429,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 "
@@ -20183,15 +20437,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"
@@ -20199,5 +20453,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."
@@ -20205,5 +20459,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 "
@@ -20212,5 +20466,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 "
@@ -20219,10 +20473,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."
@@ -20230,15 +20484,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 "
@@ -20247,10 +20502,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 "
@@ -20259,15 +20521,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 "
@@ -20277,10 +20539,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). "
@@ -20289,5 +20551,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) "
@@ -20296,5 +20558,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:89
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20303,10 +20565,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 "
@@ -20315,5 +20577,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 "
@@ -20323,5 +20585,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:97
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20330,15 +20592,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 "
@@ -20347,5 +20609,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:105
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21235,10 +21497,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 ""
@@ -21375,8 +21637,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"/>
@@ -21586,5 +21848,5 @@
 #. color motorroad
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21594,5 +21856,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21611,5 +21873,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21619,5 +21881,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21636,5 +21898,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -21644,5 +21906,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -21661,5 +21923,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -21669,5 +21931,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -21682,5 +21944,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -21698,8 +21960,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 ""
@@ -21714,5 +21976,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -21721,5 +21983,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--public_transport tags -->
 #. <rule>
@@ -21729,10 +21991,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 ""
@@ -21747,5 +22009,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -21754,5 +22016,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -21762,10 +22024,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 ""
@@ -22771,9 +23033,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 ""
@@ -23103,5 +23365,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -23111,5 +23373,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -23119,5 +23381,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -23127,5 +23389,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -23135,5 +23397,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -23143,5 +23405,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -23151,5 +23413,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -23160,5 +23422,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -23166,9 +23428,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 "سكة حديد"
@@ -24578,5 +24840,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24586,5 +24848,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24594,5 +24856,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24602,5 +24864,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -24964,7 +25226,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--sport tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -24974,5 +25236,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -24982,5 +25244,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -24990,5 +25252,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -24998,5 +25260,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -25006,5 +25268,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -25014,5 +25276,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -25022,5 +25284,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -25030,5 +25292,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -25038,5 +25300,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -25046,5 +25308,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -25054,5 +25316,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -25062,5 +25324,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -25070,5 +25332,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -25078,5 +25340,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -25086,5 +25348,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -25094,5 +25356,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -25102,5 +25364,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -25110,5 +25372,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -25118,5 +25380,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -25126,5 +25388,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -25134,5 +25396,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -25142,5 +25404,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -25150,5 +25412,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -25158,5 +25420,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -25166,5 +25428,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -25174,5 +25436,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -25182,5 +25444,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -25190,5 +25452,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -25198,5 +25460,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -25206,5 +25468,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -25214,5 +25476,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -25222,5 +25484,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -25230,5 +25492,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -25238,5 +25500,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -25246,5 +25508,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -25254,5 +25516,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -25262,5 +25524,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -25270,5 +25532,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -25278,5 +25540,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -25286,5 +25548,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -25294,5 +25556,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -25302,5 +25564,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -25310,5 +25572,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -25318,5 +25580,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -25326,5 +25588,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -25334,33 +25596,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 "الرياضة"
@@ -27038,7 +27300,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--landuse tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -27048,5 +27310,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -27056,5 +27318,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -27064,5 +27326,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -27072,5 +27334,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -27080,5 +27342,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -27088,5 +27350,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -27096,5 +27358,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -27104,12 +27366,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 "خضار"
@@ -28525,5 +28787,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -28539,5 +28801,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28547,18 +28809,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 -->
@@ -28567,7 +28846,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- cycleway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28577,5 +28856,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28585,5 +28864,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28593,5 +28872,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28601,12 +28880,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 ""
@@ -28633,5 +28913,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -28647,5 +28927,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -28655,5 +28935,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28662,13 +28942,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"/>
@@ -28679,11 +28967,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 ""
@@ -28702,8 +28991,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 ""
@@ -28815,9 +29104,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
@@ -28825,5 +29114,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,
@@ -28833,8 +29122,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
@@ -28848,5 +29137,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#. 
+#.
 #: build/trans_style.java:72
 msgid "standard"
@@ -28854,5 +29143,5 @@
 
 #. mappaint style named "standard"
-#. 
+#.
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -28901,6 +29190,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>
@@ -28980,5 +29269,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -28988,16 +29277,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 "مهجور"
@@ -29008,5 +29297,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -29015,5 +29304,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -29022,5 +29311,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -29036,5 +29325,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -29048,5 +29337,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -29055,5 +29344,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -29062,5 +29351,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -29069,5 +29358,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -29076,5 +29365,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -29083,5 +29372,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -29090,5 +29379,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxweight"/>
@@ -29097,5 +29386,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxheight"/>
@@ -29104,5 +29393,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -29111,5 +29400,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxlength"/>
@@ -29118,5 +29407,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -29125,5 +29414,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="minspeed"/>
@@ -29132,5 +29421,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxstay"/>
@@ -29139,5 +29428,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="toll"/>
@@ -29146,5 +29435,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="barrier"/>
@@ -29321,7 +29610,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- highway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -29335,5 +29624,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -29343,7 +29632,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- tracktype tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -29353,5 +29642,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -29361,5 +29650,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -29369,5 +29658,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -29377,10 +29666,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 ""
@@ -29391,5 +29680,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -29398,5 +29687,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -29406,5 +29695,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -29413,5 +29702,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -29420,5 +29709,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -29427,5 +29716,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -29434,5 +29723,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -29441,5 +29730,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -29448,5 +29737,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -29455,5 +29744,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -29462,5 +29751,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -29469,8 +29758,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 ""
@@ -29481,8 +29770,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 ""
@@ -29493,5 +29782,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -29500,8 +29789,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 "مستديرة دوران"
@@ -29512,9 +29801,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 ""
@@ -29525,9 +29814,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 "شاطئ نهر"
@@ -29538,8 +29827,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 "جدول نهر"
@@ -29550,8 +29839,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 "حوض سفن"
@@ -29562,5 +29851,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29569,5 +29858,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29576,5 +29865,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29584,5 +29873,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29591,5 +29880,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29598,5 +29887,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29605,5 +29894,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29613,5 +29902,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29622,5 +29911,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -29630,7 +29919,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--man_made tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -29640,5 +29929,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -29648,5 +29937,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -29656,5 +29945,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -29665,5 +29954,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -29672,5 +29961,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -29680,5 +29969,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -29688,5 +29977,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -29696,5 +29985,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -29704,5 +29993,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -29712,5 +30001,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -29720,5 +30009,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -29728,5 +30017,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -29736,5 +30025,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -29744,18 +30033,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 "من صنع الإنسان"
@@ -29765,9 +30054,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 ""
@@ -29778,7 +30067,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- railway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -29788,5 +30077,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -29795,5 +30084,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -29803,5 +30092,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -29810,5 +30099,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -29818,5 +30107,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -29826,10 +30115,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 ""
@@ -29840,5 +30129,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -29849,13 +30138,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 ""
@@ -29866,5 +30155,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -29874,5 +30163,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29885,5 +30174,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29891,7 +30180,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 "سكة حديد قديمة"
@@ -29902,5 +30191,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -29909,5 +30198,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -29916,5 +30205,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -29923,7 +30212,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aeroway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -29934,9 +30223,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 ""
@@ -29947,8 +30236,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 ""
@@ -29959,5 +30248,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -29967,8 +30256,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 ""
@@ -29979,8 +30268,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 ""
@@ -29991,5 +30280,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -29998,5 +30287,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -30005,7 +30294,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aerialway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -30015,5 +30304,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -30023,5 +30312,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -30031,5 +30320,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -30039,5 +30328,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -30047,10 +30336,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 "خط جوي"
@@ -30061,11 +30350,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 ""
@@ -30076,9 +30365,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 ""
@@ -30089,9 +30378,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 ""
@@ -30102,9 +30391,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 ""
@@ -30115,9 +30404,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 ""
@@ -30128,9 +30417,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 ""
@@ -30141,7 +30430,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--power tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -30151,5 +30440,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -30158,5 +30447,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -30166,5 +30455,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -30174,5 +30463,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -30182,5 +30471,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -30190,5 +30479,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -30198,5 +30487,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -30206,5 +30495,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -30214,5 +30503,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -30222,5 +30511,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -30230,5 +30519,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -30238,5 +30527,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -30246,15 +30535,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 "طاقة"
@@ -30264,9 +30553,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 "رصيف ميناء"
@@ -30277,8 +30566,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 "خط أنابيب"
@@ -30288,7 +30577,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--leisure tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -30298,5 +30587,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -30306,5 +30595,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -30314,5 +30603,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -30322,5 +30611,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -30330,5 +30619,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -30338,5 +30627,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -30346,5 +30635,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -30354,5 +30643,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -30362,5 +30651,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -30370,5 +30659,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -30378,5 +30667,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -30386,5 +30675,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -30394,5 +30683,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -30402,5 +30691,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -30410,5 +30699,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -30418,17 +30707,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 "وقت الفراغ"
@@ -30438,9 +30727,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 "مارينا"
@@ -30450,7 +30739,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--amenity tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -30460,5 +30749,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -30468,5 +30757,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -30476,5 +30765,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -30484,5 +30773,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -30492,5 +30781,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -30500,5 +30789,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -30508,5 +30797,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -30516,5 +30805,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -30524,5 +30813,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -30532,14 +30821,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 ""
@@ -30549,5 +30838,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30557,5 +30846,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30565,5 +30854,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30573,5 +30862,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30581,5 +30870,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30589,5 +30878,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30597,5 +30886,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30605,5 +30894,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30613,5 +30902,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30621,5 +30910,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -30629,5 +30918,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -30637,14 +30926,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 ""
@@ -30654,5 +30943,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -30661,5 +30950,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -30669,5 +30958,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -30676,5 +30965,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -30684,5 +30973,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -30692,5 +30981,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -30700,5 +30989,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -30707,5 +30996,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -30715,5 +31004,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -30723,5 +31012,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -30731,5 +31020,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -30739,5 +31028,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -30746,5 +31035,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -30753,5 +31042,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -30760,5 +31049,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -30767,5 +31056,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -30774,5 +31063,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -30781,5 +31070,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -30788,5 +31077,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -30795,5 +31084,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -30802,5 +31091,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -30809,5 +31098,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -30816,5 +31105,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -30823,5 +31112,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -30830,5 +31119,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -30838,5 +31127,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -30846,5 +31135,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -30854,5 +31143,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -30862,5 +31151,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -30870,5 +31159,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -30878,5 +31167,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -30886,5 +31175,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -30894,5 +31183,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -30902,5 +31191,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -30911,5 +31200,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -30919,5 +31208,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -30927,5 +31216,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -30935,5 +31224,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -30943,5 +31232,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -30951,5 +31240,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -30959,5 +31248,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -30967,5 +31256,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -30975,5 +31264,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -30983,5 +31272,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -30991,5 +31280,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -30999,5 +31288,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -31007,5 +31296,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -31015,5 +31304,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -31023,5 +31312,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -31031,5 +31320,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"/>
@@ -31039,5 +31336,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -31047,5 +31344,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -31055,5 +31352,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -31063,5 +31360,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -31070,27 +31367,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 ""
@@ -31100,5 +31398,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -31108,5 +31406,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -31116,12 +31414,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 ""
@@ -31131,5 +31429,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -31139,5 +31437,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -31147,5 +31445,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -31155,5 +31453,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -31163,5 +31461,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -31171,5 +31469,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -31179,11 +31477,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 "صحة"
@@ -31193,7 +31491,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--shop tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -31203,5 +31501,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -31211,5 +31509,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -31219,5 +31517,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -31227,5 +31525,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -31235,5 +31533,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -31243,5 +31541,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -31251,5 +31549,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -31259,5 +31557,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -31267,5 +31565,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -31275,5 +31573,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -31283,5 +31581,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -31291,5 +31589,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -31299,5 +31597,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -31307,5 +31605,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -31315,5 +31613,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -31323,5 +31621,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -31331,5 +31629,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -31339,5 +31637,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -31347,5 +31645,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -31355,5 +31653,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -31363,5 +31661,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -31371,5 +31669,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -31379,5 +31677,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -31387,5 +31685,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -31395,5 +31693,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -31403,5 +31701,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -31411,5 +31709,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -31419,5 +31717,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -31427,5 +31725,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -31435,5 +31733,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -31443,5 +31741,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -31451,5 +31749,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -31459,5 +31757,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -31467,5 +31765,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -31475,5 +31773,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -31483,5 +31781,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -31491,5 +31789,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -31499,5 +31797,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -31507,5 +31805,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -31515,5 +31813,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -31523,5 +31821,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -31531,31 +31829,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 "متجر/دكان"
@@ -31565,7 +31863,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--tourism tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31575,5 +31873,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31583,5 +31881,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31591,5 +31889,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31599,5 +31897,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31607,5 +31905,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31615,5 +31913,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31623,12 +31921,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 "فندق"
@@ -31638,5 +31936,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -31646,5 +31944,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -31654,5 +31952,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -31662,5 +31960,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -31670,5 +31968,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -31678,5 +31976,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -31687,5 +31985,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -31695,5 +31993,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- information tags -->
 #. <rule>
@@ -31703,5 +32001,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -31711,5 +32009,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -31718,5 +32016,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -31725,13 +32023,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 "سياحة"
@@ -31741,7 +32039,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--historic tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -31751,5 +32049,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -31759,5 +32057,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -31767,5 +32065,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -31775,5 +32073,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -31783,5 +32081,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -31791,5 +32089,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -31799,5 +32097,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -31807,5 +32105,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -31815,13 +32113,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 "تاريخي"
@@ -31831,8 +32129,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 "كسارة / مقلع حجارة"
@@ -31843,8 +32141,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 ""
@@ -31855,5 +32153,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -31863,8 +32161,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 "حوض"
@@ -31875,8 +32173,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 "فناء مزرعة"
@@ -31887,6 +32185,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
-#. 
+#.
+#.
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -31896,8 +32194,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 "بيع بلمفرق"
@@ -31908,8 +32206,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 "صناعي"
@@ -31920,8 +32218,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 ""
@@ -31932,8 +32230,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 "حقل خضار"
@@ -31944,8 +32242,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 ""
@@ -31956,5 +32254,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -31964,7 +32262,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--military tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -31974,5 +32272,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -31982,5 +32280,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -31990,5 +32288,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -31998,11 +32296,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 "عسكري"
@@ -32013,8 +32311,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 "مقبرة/جبانة"
@@ -32024,8 +32322,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 "قمّة"
@@ -32036,9 +32334,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 "نهر الجليد"
@@ -32048,9 +32346,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 "بركان"
@@ -32060,5 +32358,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -32069,5 +32367,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -32077,5 +32375,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -32085,5 +32383,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -32093,5 +32391,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -32101,12 +32399,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 "طبيعي"
@@ -32116,9 +32414,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 "أشجار منخفضة"
@@ -32128,9 +32426,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 "أرض بور"
@@ -32140,9 +32438,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 ""
@@ -32152,9 +32450,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 "طين"
@@ -32164,9 +32462,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 "شاطئ"
@@ -32177,5 +32475,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?
@@ -32201,5 +32499,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -32210,11 +32508,11 @@
 #. </rule>
 #. -->
-#. 
+#.
 #. <!--name tags -->
-#. 
+#.
 #. <!--preferences tags -->
-#. 
+#.
 #. <!--place tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -32224,5 +32522,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -32232,5 +32530,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -32240,5 +32538,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -32248,5 +32546,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -32256,5 +32554,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -32264,5 +32562,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -32272,5 +32570,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -32280,5 +32578,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -32288,5 +32586,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -32296,5 +32594,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -32304,5 +32602,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -32312,15 +32610,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 "المكان"
@@ -32330,9 +32628,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 ""
@@ -32423,5 +32721,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#. 
+#.
 #. Data type can be:
 #. node        - a node point
@@ -32429,28 +32727,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
@@ -32565,5 +32863,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#. 
+#.
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32576,5 +32874,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>
@@ -32599,6 +32897,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#. 
-#. 
+#.
+#.
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32607,6 +32905,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#. 
-#. 
+#.
+#.
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32621,6 +32919,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
@@ -32634,6 +32932,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
@@ -32653,6 +32951,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#. 
-#. 
+#.
+#.
 #. only for Japan
 #: build/trans_wms.java:39
@@ -32676,6 +32974,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
@@ -32700,13 +32998,10 @@
 #~ msgstr "لا تظهر مرة اخرى"
 
-#, java-format
 #~ msgid "Unknown role ''{0}''."
 #~ msgstr "دور غير معروف ''{0}''."
 
-#, java-format
 #~ msgid "Error: {0}"
 #~ msgstr "خطأ : {0}"
 
-#, java-format
 #~ msgid "Warning: {0}"
 #~ msgstr "تحذير: {0}"
@@ -32742,5 +33037,4 @@
 #~ msgstr "البريد الإلكتروني"
 
-#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "إتصل بــ {0}..."
@@ -32803,5 +33097,4 @@
 #~ msgstr "إختر أولاً إشارة مرجعية"
 
-#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "الرجاء التبليغ بواسطة بطاقة عند {0}"
@@ -32828,5 +33121,4 @@
 #~ msgstr "غير قادر على الإتصال بلمخدم."
 
-#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "المؤلفون: {0}"
@@ -32859,9 +33151,7 @@
 #~ msgstr "إقرءGPX..."
 
-#, java-format
 #~ msgid "No time for point {0} x {1}"
 #~ msgstr "لا توقيت للنقطة {0} x {1}"
 
-#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} من ضمن المسلك."
@@ -32915,13 +33205,10 @@
 #~ msgstr "حرّك إلى الأعلى"
 
-#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "محرّر العلاقات: {0}"
 
-#, java-format
 #~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
 #~ msgstr "غير قادر على قراءة الزمن \"{0}\" من النقطة {1} x {2}"
 
-#, java-format
 #~ msgid "current delta: {0}s"
 #~ msgstr "الإنحراف الحالي: {0}ث"
@@ -32939,5 +33226,4 @@
 #~ msgstr "علاقة متناقضة"
 
-#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "غير قادر على فتح دليل التفضيلات: {0}"
@@ -32946,9 +33232,7 @@
 #~ msgstr "لم أجد طريق \"إلى\""
 
-#, java-format
 #~ msgid "multipolygon way ''{0}'' is not closed."
 #~ msgstr "الطريق ''{0}'' المتعددة الأضلاع هي غير مغلقة."
 
-#, java-format
 #~ msgid "Way ''{0}'' with less than two points."
 #~ msgstr "للطريق ''{0}'' أقل من نقطتين."
@@ -32957,9 +33241,7 @@
 #~ msgstr "لم أجد طريق \"من\""
 
-#, java-format
 #~ msgid "Unknown member type for ''{0}''."
 #~ msgstr "نوع عضو غير معروف لِــ ''{0}''"
 
-#, java-format
 #~ msgid "Inner way ''{0}'' is outside."
 #~ msgstr "الطريق الداخلية ''{0}''موجودة في الخارج."
@@ -32969,7 +33251,8 @@
 
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want to "
-#~ "combine them?"
-#~ msgstr "إن للطرقات المختارة عضويات في علاقات مختلفة. هل تريد دمجها رغم ذلك ؟"
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
+#~ msgstr ""
+#~ "إن للطرقات المختارة عضويات في علاقات مختلفة. هل تريد دمجها رغم ذلك ؟"
 
 #~ msgid "All the ways were empty"
@@ -32979,5 +33262,4 @@
 #~ msgstr "حمّل الخيار"
 
-#, java-format
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "لم أتمكن من القراءة من الــ URL: \"{0}\""
@@ -32998,5 +33280,4 @@
 #~ msgstr "الرجاء تحديد على الأقل مهمة لتنزيلها"
 
-#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "خطء عند تحميل الصفحة {0}"
@@ -33032,5 +33313,4 @@
 #~ msgstr "مساعدة"
 
-#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "تكدس الأوامر: {0}"
@@ -33086,14 +33366,10 @@
 
 #~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
 #~ msgstr ""
 #~ "صفحة المساعدة مفقودة. إنشائها بِــ <A HREF=\"{0}\"> الإنكليزية</A> أو <A "
 #~ "HREF=\"{1}\">بِلغتك</A>."
 
-#, java-format
 #~ msgid "Parameter ''{0}'' must not be null."
 #~ msgstr "لا يجب على المتغير  ''{0}'' أن يكون صفراً"
-
-#~ msgid "Are you sure?"
-#~ msgstr "هل أنت متأكد ؟"
Index: /applications/editors/josm/i18n/po/bg.po
===================================================================
--- /applications/editors/josm/i18n/po/bg.po	(revision 21970)
+++ /applications/editors/josm/i18n/po/bg.po	(revision 21971)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-15 17:35+0200\n"
-"PO-Revision-Date: 2010-05-16 12:49+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2010-06-23 22:47+0200\n"
+"PO-Revision-Date: 2010-06-18 06:18+0000\n"
+"Last-Translator: pl71 <Unknown>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-06-15 16:19+0000\n"
+"X-Launchpad-Export-Date: 2010-06-23 20:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -23,5 +23,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
@@ -93,5 +93,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
@@ -252,5 +252,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
@@ -273,5 +273,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
@@ -279,6 +279,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
@@ -287,4 +289,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
@@ -322,6 +326,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 ""
 "<html>Няма слоеве към които слоя източник<br>''{0}''.<br>би могъл да се "
@@ -347,9 +351,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
@@ -409,4 +413,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
@@ -446,5 +451,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 "Информация"
@@ -656,5 +661,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
@@ -669,5 +674,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 "Изтриване"
@@ -918,4 +923,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 ""
@@ -926,4 +932,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 ""
@@ -1479,6 +1486,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
@@ -1505,4 +1512,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
@@ -1511,6 +1520,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 "Грешка"
@@ -1626,6 +1635,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 ""
 "Показва отчет на статуса с полезна информация, която може да бъде свързана с "
@@ -1663,8 +1671,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 ""
@@ -1673,5 +1683,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 "Не, изход"
@@ -1679,16 +1690,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 "Моля изберете поне един път за опростяване."
@@ -1697,13 +1713,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 ""
@@ -1712,8 +1731,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"
@@ -1723,4 +1744,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)"
@@ -1792,6 +1814,6 @@
 "should verify this and correct it when necessary.</html>"
 msgstr ""
-"<html>Ролевото членство в релация беше копирано за всички нови "
-"пътища.<br>Трябва да го проверите и коригирате ако е необходимо.</html>"
+"<html>Ролевото членство в релация беше копирано за всички нови пътища."
+"<br>Трябва да го проверите и коригирате ако е необходимо.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
@@ -1860,6 +1882,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 ""
 "* Една точка, която се използва от няколко линии и една от тези линии, или"
@@ -1932,9 +1953,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)"
@@ -1951,5 +1972,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
@@ -2013,5 +2034,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 "Няма промени за качване."
@@ -2029,14 +2049,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 ""
@@ -2292,5 +2312,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
@@ -2409,6 +2429,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 ""
 "Влачете позицията на просвирване и пуснете близо до следата за да "
@@ -2546,5 +2566,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."
@@ -2593,6 +2613,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
-msgstr ""
-"<b>Baker Street</b> - ''Baker'' и ''Street'' в кой да е ключ или име."
+msgstr "<b>Baker Street</b> - ''Baker'' и ''Street'' в кой да е ключ или име."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
@@ -2635,6 +2654,5 @@
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
-msgstr ""
-"<b>тип:</b> - тип на обекта (<b>възел</b>, <b>път</b>, <b>връзка</b>)"
+msgstr "<b>тип:</b> - тип на обекта (<b>възел</b>, <b>път</b>, <b>връзка</b>)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
@@ -2664,6 +2682,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 ""
 
@@ -2714,6 +2732,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr ""
-"Използвайте <b>|</b> или <b>OR</b> за да обедините в логическо \"ИЛИ\""
+msgstr "Използвайте <b>|</b> или <b>OR</b> за да обедините в логическо \"ИЛИ\""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
@@ -2767,6 +2784,5 @@
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
-msgstr ""
-"Нищо не е премахнато от селекцията в резултат на търсенето за ''{0}''"
+msgstr "Нищо не е премахнато от селекцията в резултат на търсенето за ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394
@@ -2937,10 +2953,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
@@ -3064,5 +3084,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
@@ -3143,7 +3163,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 ""
 "Вие се каните да изтриете възли, намиращи се извън зоната, която сте свалили "
@@ -3192,11 +3212,11 @@
 msgstr[1] "Преместване {0} възела"
 
-#: ../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 "Обектът ''{0}'' е изтрит"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111
 #, java-format
 msgid "Purged {0} object"
@@ -3205,5 +3225,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 #, java-format
 msgid ""
@@ -3214,5 +3234,5 @@
 "стойност - {1}"
 
-#: ../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}"
@@ -3428,6 +3448,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 ""
 
@@ -3512,5 +3532,5 @@
 #. *
 #. * the decimal format 999.999
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3519,5 +3539,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3526,5 +3546,5 @@
 #. *
 #. * coordinates East/North
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3571,4 +3591,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}"
@@ -3580,29 +3603,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 ""
 
@@ -3681,19 +3698,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 "Примитив с ID = 0 не може да бъде невидим."
 
-#: ../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 "Очаква се ID > 0. Имаме {0}."
 
-#: ../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 "Очакваше се Version > 0. Имаме: {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:795
 #, java-format
 msgid ""
@@ -3702,5 +3719,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 "
@@ -3708,5 +3725,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 ""
@@ -3762,6 +3779,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 ""
 
@@ -3776,5 +3792,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 "избран"
@@ -3938,9 +3954,8 @@
 #: ../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>"
-msgstr ""
-"<html>Невъзможно прочитането на отметките от<br>''{0}''<br>Грешката е: "
-"{1}</html>"
+msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+"<html>Невъзможно прочитането на отметките от<br>''{0}''<br>Грешката е: {1}</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
@@ -4010,5 +4025,5 @@
 #. color tiger_data
 #. </rule>
-#. 
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4018,5 +4033,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4025,5 +4040,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4032,5 +4047,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4039,5 +4054,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4046,5 +4061,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4053,9 +4068,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--annotation tags -->
-#. 
+#.
 #. <!--"work in progress" tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="building"/>
@@ -4064,5 +4079,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 "сграда"
@@ -4149,5 +4164,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
@@ -4198,6 +4213,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
-msgstr ""
-"Променете размера на аплета до зададения (формат: ШИРОЧИНА x ВИСОЧИНА)"
+msgstr "Променете размера на аплета до зададения (формат: ШИРОЧИНА x ВИСОЧИНА)"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
@@ -4374,5 +4388,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
@@ -4381,4 +4395,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
@@ -4528,6 +4543,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:101
 msgid "unset: do not set this property on the selected objects"
-msgstr ""
-"unset: не променяйте стойността на този параметър на избраните обекти"
+msgstr "unset: не променяйте стойността на този параметър на избраните обекти"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150
@@ -4580,5 +4594,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
@@ -4617,6 +4631,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 ""
 
@@ -4647,5 +4661,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"
@@ -4654,5 +4668,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"
@@ -4661,5 +4675,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"
@@ -4875,6 +4889,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 ""
 
@@ -4955,6 +4968,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their "
-"entries.</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 
@@ -4962,6 +4975,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 ""
 
@@ -5012,6 +5025,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 ""
 
@@ -5230,10 +5243,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"
@@ -5242,10 +5257,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
@@ -5327,4 +5344,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 "няма/никой"
@@ -5541,7 +5559,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 ""
 
@@ -5566,6 +5584,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 ""
 
@@ -5611,5 +5628,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
@@ -5665,6 +5682,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225
 msgid "Apply resolved conflicts and close the dialog"
-msgstr ""
-"Прилагане на разрешените конфликти и затваряне на диалоговия прозорец"
+msgstr "Прилагане на разрешените конфликти и затваряне на диалоговия прозорец"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226
@@ -5683,10 +5699,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 ""
 
@@ -5709,5 +5724,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
@@ -5715,5 +5730,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 "Добави"
@@ -5762,5 +5777,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 "История"
@@ -5784,6 +5799,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
 msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-"Презареждане на всички текущо избрани обекти и опресняване на списъка."
+msgstr "Презареждане на всички текущо избрани обекти и опресняване на списъка."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:322
@@ -5981,10 +5995,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 ""
@@ -6028,5 +6042,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
 msgid "Click to minimize/maximize the panel content"
-msgstr "Натиснете за да минимизирате/максимизирате съдържанието на панела"
+msgstr "Намаляване/увеличаване на панела"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:65
@@ -7441,6 +7455,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 ""
 
@@ -7464,8 +7478,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 ""
 
@@ -7585,9 +7599,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."
@@ -7596,23 +7610,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 "<различни>"
 
-#: ../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 "Промени стойностите?"
 
-#: ../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"
@@ -7621,5 +7635,5 @@
 msgstr[1] "Промяна параметрите на {0} обекта"
 
-#: ../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."
@@ -7628,77 +7642,77 @@
 msgstr[1] "Това ще промени до {0} обекта"
 
-#: ../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 "Моля, изберете ключ"
 
-#: ../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 "Изберете стойност"
 
-#: ../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 "Параметри/Отношения"
 
-#: ../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 "Параметри на избраните обекти"
 
 #. 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 "Свойства: {0} / Членство: {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 "Параметри / Отношения"
 
-#: ../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 "Промяна на връзка"
 
-#: ../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 "Изваждане на избраните обекти от релация {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 "Изтриване на избрания ключ за всички обекти"
 
-#: ../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 "Добавяне на нова двойка ключ/стойност за всички обекти"
 
-#: ../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 "Редактиране стойността на избрания ключ за всички обекти"
 
-#: ../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 ""
@@ -7815,6 +7829,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 ""
 
@@ -7832,6 +7846,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 ""
 
@@ -7986,7 +8000,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 ""
 
@@ -8322,7 +8335,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 ""
 
@@ -8463,6 +8475,6 @@
 "english.<br><br>Please help to improve the JOSM help system and fill in the "
 "missing information. You can both edit the <a href=\"{2}\">help topic in "
-"your local language ({1})</a> and the <a href=\"{3}\">help topic in "
-"english</a>.</p></html>"
+"your local language ({1})</a> and the <a href=\"{3}\">help topic in english</"
+"a>.</p></html>"
 msgstr ""
 
@@ -8472,6 +8484,6 @@
 "<html><p class=\"error-header\">Error when retrieving help information</p><p "
 "class=\"error-body\">The content for the help topic <strong>{0}</strong> "
-"could not be loaded. The error message is "
-"(untranslated):<br><tt>{1}</tt></p></html>"
+"could not be loaded. The error message is (untranslated):<br><tt>{1}</tt></"
+"p></html>"
 msgstr ""
 
@@ -8745,9 +8757,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 ""
 "<html>Качването се <strong>провали</strong> понеже на сървъра има по-нова "
@@ -8755,7 +8766,7 @@
 "конфликта се явява <strong>{0}</strong> с id <strong>{1}</strong>,<br>версия "
 "на сървъра {2}, а ваша версия {3}.<br><br>Натиснете <strong>{4}</strong> за "
-"да синхронизирате само конфликтните примитиви.<br>Натиснете "
-"<strong>{5}</strong> за да синхронизирате целия локален набор данни с "
-"сървъра.<br>Натиснете <strong>{6}</strong> за да прекратите и продължите "
+"да синхронизирате само конфликтните примитиви.<br>Натиснете <strong>{5}</"
+"strong> за да синхронизирате целия локален набор данни с сървъра."
+"<br>Натиснете <strong>{6}</strong> за да прекратите и продължите "
 "редактирането.<br></html>"
 
@@ -8770,14 +8781,13 @@
 msgid ""
 "<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click "
-"<strong>{0}</strong> to synchronize the entire local dataset with the "
-"server.<br>Click <strong>{1}</strong> to abort and continue "
-"editing.<br></html>"
+"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
+"</strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{1}</strong> to abort and continue editing.<br></html>"
 msgstr ""
 "<html>Качването <strong>неуспешно</strong> защото сървърът има по-нова "
 "версия <br>на някой от вашите възли, пътища, или отношения.<br><br>Кликнете "
-"<strong>{0}</strong> за да синхронизирате цялата база данни със "
-"сървъра.<br>Кликнете <strong>{1}</strong> за отказ и продължаване на "
-"редакциите.<br></html>"
+"<strong>{0}</strong> за да синхронизирате цялата база данни със сървъра."
+"<br>Кликнете <strong>{1}</strong> за отказ и продължаване на редакциите."
+"<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194
@@ -9024,5 +9034,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 "Не"
@@ -9030,6 +9040,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 ""
 "Слоят ''{0}'' съдържа промени, които трябва да бъдат качени на сървъра."
@@ -9115,6 +9124,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] ""
@@ -9128,6 +9137,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 "
@@ -9353,5 +9362,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9377,6 +9386,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 ""
 
@@ -9397,6 +9405,6 @@
 "Качване на <strong>{0} обект</strong> към <strong>1 списък с промени</strong>"
 msgstr[1] ""
-"Качване на <strong>{0} обекта</strong> към <strong>1 списък с "
-"промени</strong>"
+"Качване на <strong>{0} обекта</strong> към <strong>1 списък с промени</"
+"strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:87
@@ -9409,9 +9417,9 @@
 "<strong>1 request</strong>"
 msgstr[0] ""
-"Качване на <strong>{0} обект</strong> към <strong>1 списък с "
-"промени</strong>, като се ползва <strong>1 заявка</strong>."
+"Качване на <strong>{0} обект</strong> към <strong>1 списък с промени</"
+"strong>, като се ползва <strong>1 заявка</strong>."
 msgstr[1] ""
-"Качване на <strong>{0} обекта</strong> към <strong>1 списък с "
-"промени</strong>, като се ползва <strong>1 заявка</strong>."
+"Качване на <strong>{0} обекта</strong> към <strong>1 списък с промени</"
+"strong>, като се ползва <strong>1 заявка</strong>."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:92
@@ -9421,6 +9429,6 @@
 "<strong>{1} requests</strong>"
 msgstr ""
-"Качване на <strong>{0} обекта</strong> към <strong>1 списък с "
-"промени</strong>, като се ползват <strong>{1} заявки</strong>."
+"Качване на <strong>{0} обекта</strong> към <strong>1 списък с промени</"
+"strong>, като се ползват <strong>{1} заявки</strong>."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:94
@@ -9440,6 +9448,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 ""
 "Качване на <strong>{0} обекта</strong> към <strong>няколко списъка с "
@@ -9495,7 +9503,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 ""
 
@@ -9505,5 +9513,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9519,5 +9527,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..."
@@ -9528,6 +9536,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 ""
 
@@ -9745,7 +9752,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 ""
 
@@ -9771,7 +9778,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 ""
 
@@ -9835,9 +9842,9 @@
 #: ../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:"
-msgstr ""
-"<html>Качването на необработени GPS данни в картата се смята за "
-"вредно.<br>Ако искате да качвате следи, погледнете тук:"
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>Качването на необработени GPS данни в картата се смята за вредно."
+"<br>Ако искате да качвате следи, погледнете тук:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
@@ -10018,6 +10025,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 ""
 
@@ -10077,7 +10084,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 ""
 "<html>Снимайте вашия GPS приемник, докато той показва времето.<br>Покажете "
@@ -10670,6 +10677,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 ""
 
@@ -10691,8 +10698,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 ""
 
@@ -10812,6 +10819,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 ""
 
@@ -10921,6 +10928,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 ""
 
@@ -11054,8 +11060,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 ""
 
@@ -11138,8 +11144,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 ""
 
@@ -11166,7 +11172,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 ""
 
@@ -11218,5 +11224,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 "Моля, изберете ред за изтриване."
@@ -11591,6 +11597,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 ""
 "Изобразвай стрелки с посоката, използвайки таблици вместо математически "
@@ -11656,6 +11661,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 "Приложи изглаждане върху картата."
 
@@ -11729,5 +11733,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 "Използване на вградените настройки"
@@ -11747,6 +11751,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>:"
@@ -11871,6 +11874,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 ""
 
@@ -11883,9 +11886,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 ""
 
@@ -11908,6 +11911,6 @@
 "encountered.</p>"
 msgstr ""
-"<p>Псевдо-модификатор ''изключено'' ще изключва бърза клавишна "
-"комбинация.</p>"
+"<p>Псевдо-модификатор ''изключено'' ще изключва бърза клавишна комбинация.</"
+"p>"
 
 #. scroll up
@@ -12186,6 +12189,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 ""
 
@@ -12196,5 +12199,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 ""
@@ -12204,18 +12207,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 ""
@@ -12224,5 +12227,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 ""
@@ -12231,5 +12234,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 ""
@@ -12238,9 +12241,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 "Шаблони за маркиране"
@@ -12349,6 +12352,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 ""
 
@@ -12370,6 +12373,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 ""
 
@@ -12447,6 +12450,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 ""
 
@@ -12462,6 +12464,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 ""
 
@@ -12555,6 +12556,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 ""
 
@@ -12687,4 +12688,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 "Промяна параметри"
@@ -12850,5 +12852,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
@@ -12868,5 +12870,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}''"
@@ -13033,6 +13035,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 ""
 
@@ -13149,10 +13150,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 ""
@@ -13160,69 +13161,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 "Успешно отворен списък с промени {0}"
 
-#: ../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 "Изчакване 10 секунди "
 
-#: ../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}."
@@ -13400,4 +13401,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})"
@@ -13417,6 +13419,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 ""
 
@@ -13444,6 +13446,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 ""
 
@@ -13487,6 +13489,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 ""
 
@@ -13921,6 +13922,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 ""
 
@@ -13928,6 +13929,5 @@
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr ""
-"Невъзможно зареждането на модул {0}. Да се премахне ли от настройките?"
+msgstr "Невъзможно зареждането на модул {0}. Да се премахне ли от настройките?"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:382
@@ -14133,6 +14133,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 ""
 
@@ -14199,5 +14198,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"
@@ -14258,6 +14257,6 @@
 "the server URL in your preferences and your internet connection.</html>"
 msgstr ""
-"<html>Пропадна инициализацията на връзката със сървъра на OSM "
-"{0}.<br>Проверете URL на сървъра в настройките, а също и Вашата връзка с "
+"<html>Пропадна инициализацията на връзката със сървъра на OSM {0}."
+"<br>Проверете URL на сървъра в настройките, а също и Вашата връзка с "
 "Интернет.</html>"
 
@@ -14283,6 +14282,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 ""
 
@@ -14290,7 +14289,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 ""
 
@@ -14298,7 +14297,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 ""
 
@@ -14306,8 +14305,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 ""
 
@@ -14327,7 +14326,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 ""
 
@@ -14396,7 +14395,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 ""
 
@@ -14408,7 +14406,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 ""
 
@@ -14440,6 +14438,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 ""
 
@@ -14950,6 +14948,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>"
@@ -14976,6 +14974,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"
@@ -15013,6 +15011,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"
@@ -15028,7 +15026,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"
@@ -15079,9 +15077,29 @@
 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 "Сгради"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#, fuzzy
+msgid "Rotate crosshair"
+msgstr "Завърти надясно"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#, fuzzy
+msgid "Advanced settings"
+msgstr "Допълнителни настройки"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#, fuzzy
+msgid "Building tag:"
+msgstr "Сграда"
+
+#: ../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"
@@ -15090,35 +15108,45 @@
 #: ../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 "Обществена сграда"
+
+#: ../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
+#, fuzzy
+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 ""
 
@@ -15293,7 +15321,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--waterway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15303,5 +15331,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15311,5 +15339,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15325,5 +15353,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15333,5 +15361,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15339,8 +15367,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 "вода"
@@ -15362,5 +15390,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15369,5 +15397,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15376,5 +15404,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15383,5 +15411,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15390,5 +15418,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15397,10 +15425,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 "адрес"
@@ -15429,19 +15457,17 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
-msgstr ""
-"Специален доставчик на френски кадастров wms на "
-"www.cadastre.gouv.fr<BR><BR>Моля прочетете правилата и условията за ползване "
-"оттук (на френски): <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> преди да качвате каквито и да са данни създадени с това разширение."
+"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 ""
+"Специален доставчик на френски кадастров wms на www.cadastre.gouv."
+"fr<BR><BR>Моля прочетете правилата и условията за ползване оттук (на "
+"френски): <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> преди да качвате каквито и да са "
+"данни създадени с това разширение."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98
@@ -15879,6 +15905,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 "Празен слой"
@@ -16065,4 +16091,52 @@
 msgstr "Не е открит слой с GPX данни."
 
+#: ../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 "Редактирай зоопарк"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#, fuzzy
+msgid "Name:"
+msgstr "Име"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#, fuzzy
+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
+#, fuzzy, java-format
+msgid "Delete tool \"{0}\"?"
+msgstr "Изтриване на {0} път"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:74
+msgid "Are you sure?"
+msgstr "Сигурни ли сте?"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
+#, fuzzy
+msgid "New tool..."
+msgstr "Нова роля"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
+#, fuzzy
+msgid "Install"
+msgstr "Промишленост"
+
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
 msgid "Position only"
@@ -16332,5 +16406,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#. 
+#.
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16451,6 +16525,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 "Максимален брой сегменти в създаваните линии. По подразбиране 250."
 
@@ -16473,7 +16546,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 ""
 "Точност на алгоритъма на Douglas-Peucker за опростяване на линии, измервана "
@@ -16793,6 +16865,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 ""
 "Заглавната част съдържа няколко стойности и не може да бъде представена с "
@@ -16908,6 +16979,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 ""
 
@@ -16923,6 +16993,5 @@
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:49
 msgid "Open only files that are visible in current view."
-msgstr ""
-"Отваряне само на файлове, които са видими в текущата област на екрана."
+msgstr "Отваряне само на файлове, които са видими в текущата област на екрана."
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:59
@@ -16961,6 +17030,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 ""
 
@@ -17331,5 +17399,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}"
@@ -17380,4 +17448,43 @@
 msgid "Revert changeset #{0}"
 msgstr ""
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:78
+#, fuzzy
+msgid "Road Sign Plugin"
+msgstr "Зареждане на разширения"
+
+#: ../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 "Не може да се прочете източник на шаблони за маркиране: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
+#, fuzzy, java-format
+msgid "Error parsing tagging preset from ''{0}'':\n"
+msgstr ""
+"Грешка при инициализиране на тест {0}:\n"
+" {1}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:104
+#, fuzzy, java-format
+msgid "Sign {0}"
+msgstr "Избрано: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:111
+#, fuzzy, java-format
+msgid "Additional sign {0}"
+msgstr "Добавяне на отношение {0}"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -17422,13 +17529,13 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73
 msgid "Click to add destination."
-msgstr "Натиснете за да добавите цел."
+msgstr "Добавяне на цел"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88
 msgid "Click and drag to move destination"
-msgstr "Натиснете и влачете за да преместите цел."
+msgstr "Натиснете и влачете за да преместите цел"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:77
 msgid "Click to remove destination"
-msgstr "Натиснете за да премахнете цел."
+msgstr "Премахване на цел"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
@@ -17483,4 +17590,15 @@
 msgid "Enter weight values"
 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 "Опростяване на път"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
+#, fuzzy
+msgid "Delete unnecessary nodes from an area."
+msgstr "Премахване на ненужни точки от път."
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
@@ -17587,6 +17705,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:107
 msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
-msgstr ""
-"Дублирането на бърз клавиш за бутона '{0}' - бутона ще бъде игнориран!"
+msgstr "Дублирането на бърз клавиш за бутона '{0}' - бутона ще бъде игнориран!"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:40
@@ -18279,6 +18396,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 ""
 
@@ -18364,8 +18481,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 ""
 
@@ -18419,8 +18536,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 ""
 
@@ -18532,6 +18649,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 ""
 
@@ -18539,6 +18656,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 ""
 
@@ -19201,7 +19318,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 ""
 "Източници на правила (URL или име на файл) за правописна проверка (see "
@@ -19401,9 +19517,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 "област"
@@ -19501,11 +19617,146 @@
 msgstr "{0}, ..."
 
-#: ../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
+#, fuzzy, java-format
+msgid "{0} {1}% of GPS track"
+msgstr "{0} се състои от {1} следа"
+
+#: ../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 "Импорт Аудио"
+
+#: ../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 "Премахни"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
+#, fuzzy
+msgid "removes current video from layer"
+msgstr "Премахване на снимка от слой"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
+#, fuzzy
+msgid "play/pause"
+msgstr "Изпълнение/Пауза"
+
+#: ../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 "фон"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
+#, fuzzy
+msgid "jumps n sec back"
+msgstr "Прескочи назад."
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "forward"
+msgstr "Напред"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "jumps n sec forward"
+msgstr "Прескочи напред"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
+#, fuzzy
+msgid "faster"
+msgstr "По-бързо"
+
+#: ../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 "По-бавно"
+
+#: ../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 "Позволява добавянето на маркери/възли на текущата gps позиция."
+
+#. 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
+#, fuzzy
+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
+#, fuzzy
+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 "слой"
+
+#: ../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 ""
 
@@ -19720,28 +19971,28 @@
 "Това може да доведе до погрешни координати."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
 msgid "Automatic downloading"
 msgstr "Автоматично сваляне"
 
-#: ../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 "WMS слой ({0}), автоматично сваляне в мащаб {1}"
 
-#: ../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 "WMS слой ({0}), сваляне в мащаб {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
 #, java-format
 msgid ""
@@ -19756,17 +20007,17 @@
 "WMS въпреки всичко?"
 
-#: ../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 "Невалиден URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311
 msgid "Download visible tiles"
 msgstr "Сваляне на видимите квадранти"
 
-#: ../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"
@@ -19775,96 +20026,96 @@
 "разделителната способност."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329
 msgid "Change resolution"
 msgstr "Смяна разделителна способност"
 
-#: ../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 "Запис на WMS слоя във файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
 msgid "Save WMS layer"
 msgstr "Запис на слоя WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413
 msgid "Load WMS layer from file"
 msgstr "Зареждане на WMS слой от файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
 msgid "Load WMS layer"
 msgstr "Четене на WMS слой"
 
-#: ../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 "Неподдъжана WMS файлова версия; намерена {0}, очаквана {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 "Отворете празен WMS слой за да заредите данни от файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
 msgid "WMS Plugin Preferences"
 msgstr "Настройки модул WMS"
 
-#: ../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 "Промяна списъка с WMS сървъри показвани в менюто на WMS разширението"
 
-#: ../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 "Име на меню"
 
-#: ../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 "WMS URL"
 
-#: ../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 "WMS URL (по подразбиране)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:86
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
 msgid "Enter a menu name and WMS URL"
 msgstr "Въведете име на меню и WMS URL"
 
-#: ../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 ""
@@ -19880,4 +20131,8 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
 msgid "% of north:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186
+msgid "Simultaneous connections"
 msgstr ""
 
@@ -19890,7 +20145,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
@@ -19942,8 +20197,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 "гора"
@@ -19960,7 +20215,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--boundary tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -19970,5 +20225,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -20011,5 +20266,5 @@
 #. color boundary
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -20019,5 +20274,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -20027,5 +20282,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -20035,15 +20290,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 "граница"
@@ -20059,5 +20314,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -20066,7 +20321,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--route tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -20076,5 +20331,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -20084,5 +20339,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -20092,5 +20347,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -20100,5 +20355,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -20108,5 +20363,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -20116,5 +20371,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -20124,12 +20379,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 "маршрут"
@@ -20413,21 +20668,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 "Сваляне GPS точки от Globalsat dg100 дата логер директно в JOSM."
 
 #. 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 "
@@ -20440,10 +20694,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:34
 msgid "Helps vectorizing WMS images."
 msgstr "Помага за векторизиране на WMS изображения."
 
 #. 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."
@@ -20452,5 +20706,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 "
@@ -20463,15 +20717,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 "
@@ -20480,5 +20734,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 "
@@ -20491,15 +20745,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:48
 msgid "Displays an OpenLayers background image"
 msgstr "Показва OpenLayers фоново изображение"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:50
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Вкарва проблеми от OpenStreetBugs"
 
 #. 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"
@@ -20509,5 +20763,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."
@@ -20517,5 +20771,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 "
@@ -20524,5 +20778,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 "
@@ -20533,10 +20787,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Великият JGoodies Plastic Look and Feel."
 
 #. 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."
@@ -20544,15 +20798,16 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "Let other applications send commands to JOSM."
 msgstr "Позволява на други приложения да изпращат команди към JOSM."
 
 #. 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 "
@@ -20561,10 +20816,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 "
@@ -20575,15 +20837,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:77
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Позволява добавянето на маркери/възли на текущата gps позиция."
 
 #. 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 "
@@ -20597,10 +20859,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). "
@@ -20609,5 +20871,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) "
@@ -20616,5 +20878,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:89
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20623,10 +20885,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 "
@@ -20638,5 +20900,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 "
@@ -20646,5 +20908,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:97
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20653,15 +20915,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 "
@@ -20670,5 +20932,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:105
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21558,10 +21820,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 "кръгово"
@@ -21698,8 +21960,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"/>
@@ -21909,5 +22171,5 @@
 #. color motorroad
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21917,5 +22179,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21934,5 +22196,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21942,5 +22204,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21959,5 +22221,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -21967,5 +22229,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -21984,5 +22246,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -21992,5 +22254,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -22005,5 +22267,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -22021,8 +22283,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 "улица"
@@ -22037,5 +22299,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -22044,5 +22306,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--public_transport tags -->
 #. <rule>
@@ -22052,10 +22314,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 "служебна"
@@ -22070,5 +22332,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -22077,5 +22339,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -22085,10 +22347,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 "ремонт"
@@ -23094,9 +23356,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 "блато"
@@ -23426,5 +23688,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -23434,5 +23696,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -23442,5 +23704,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -23450,5 +23712,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -23458,5 +23720,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -23466,5 +23728,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -23474,5 +23736,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -23483,5 +23745,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -23489,9 +23751,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 "ЖП"
@@ -24044,10 +24306,10 @@
 #: build/trans_presets.java:1344
 msgid "Diesel"
-msgstr ""
+msgstr "Дизел"
 
 #. item "Car/Fuel" check "Diesel"
 #: build/trans_presets.java:1345
 msgid "Bio Diesel"
-msgstr ""
+msgstr "Био дизел"
 
 #. item "Car/Fuel" check "Bio Diesel"
@@ -24064,20 +24326,20 @@
 #: build/trans_presets.java:1348
 msgid "Octane 91"
-msgstr ""
+msgstr "Бензин А91"
 
 #. item "Car/Fuel" check "Octane 91"
 #: build/trans_presets.java:1349
 msgid "Octane 95"
-msgstr ""
+msgstr "Бензин А95"
 
 #. item "Car/Fuel" check "Octane 95"
 #: build/trans_presets.java:1350
 msgid "Octane 98"
-msgstr ""
+msgstr "Бензин А98"
 
 #. item "Car/Fuel" check "Octane 98"
 #: build/trans_presets.java:1351
 msgid "Octane 100"
-msgstr ""
+msgstr "Бензин А100"
 
 #. item "Car/Fuel" check "Octane 100"
@@ -24901,5 +25163,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24909,5 +25171,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24917,5 +25179,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24925,5 +25187,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -25287,7 +25549,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--sport tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -25297,5 +25559,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -25305,5 +25567,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -25313,5 +25575,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -25321,5 +25583,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -25329,5 +25591,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -25337,5 +25599,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -25345,5 +25607,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -25353,5 +25615,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -25361,5 +25623,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -25369,5 +25631,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -25377,5 +25639,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -25385,5 +25647,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -25393,5 +25655,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -25401,5 +25663,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -25409,5 +25671,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -25417,5 +25679,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -25425,5 +25687,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -25433,5 +25695,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -25441,5 +25703,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -25449,5 +25711,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -25457,5 +25719,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -25465,5 +25727,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -25473,5 +25735,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -25481,5 +25743,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -25489,5 +25751,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -25497,5 +25759,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -25505,5 +25767,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -25513,5 +25775,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -25521,5 +25783,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -25529,5 +25791,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -25537,5 +25799,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -25545,5 +25807,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -25553,5 +25815,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -25561,5 +25823,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -25569,5 +25831,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -25577,5 +25839,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -25585,5 +25847,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -25593,5 +25855,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -25601,5 +25863,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -25609,5 +25871,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -25617,5 +25879,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -25625,5 +25887,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -25633,5 +25895,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -25641,5 +25903,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -25649,5 +25911,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -25657,33 +25919,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 "спорт"
@@ -27361,7 +27623,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--landuse tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -27371,5 +27633,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -27379,5 +27641,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -27387,5 +27649,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -27395,5 +27657,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -27403,5 +27665,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -27411,5 +27673,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -27419,5 +27681,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -27427,12 +27689,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 "зеленина"
@@ -28848,5 +29110,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -28862,5 +29124,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28870,18 +29132,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 -->
@@ -28890,7 +29169,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- cycleway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28900,5 +29179,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28908,5 +29187,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28916,5 +29195,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28924,12 +29203,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 "велосипед"
@@ -28956,5 +29236,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -28970,5 +29250,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -28978,5 +29258,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28985,13 +29265,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"/>
@@ -29002,11 +29290,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 "пеш"
@@ -29025,8 +29314,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 "метро"
@@ -29138,9 +29427,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
@@ -29148,5 +29437,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,
@@ -29156,8 +29445,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
@@ -29171,5 +29460,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#. 
+#.
 #: build/trans_style.java:72
 msgid "standard"
@@ -29177,5 +29466,5 @@
 
 #. mappaint style named "standard"
-#. 
+#.
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -29224,6 +29513,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>
@@ -29303,5 +29592,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -29311,16 +29600,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 "остарял, вече невалиден"
@@ -29331,5 +29620,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -29338,5 +29627,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -29345,5 +29634,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -29359,5 +29648,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -29371,5 +29660,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -29378,5 +29667,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -29385,5 +29674,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -29392,5 +29681,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -29399,5 +29688,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -29406,5 +29695,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -29413,5 +29702,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxweight"/>
@@ -29420,5 +29709,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxheight"/>
@@ -29427,5 +29716,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -29434,5 +29723,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxlength"/>
@@ -29441,5 +29730,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -29448,5 +29737,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="minspeed"/>
@@ -29455,5 +29744,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxstay"/>
@@ -29462,5 +29751,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="toll"/>
@@ -29469,5 +29758,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="barrier"/>
@@ -29644,7 +29933,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- highway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -29658,5 +29947,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -29666,7 +29955,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- tracktype tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -29676,5 +29965,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -29684,5 +29973,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -29692,5 +29981,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -29700,10 +29989,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 "път_от_пътна_мрежа"
@@ -29714,5 +30003,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -29721,5 +30010,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -29729,5 +30018,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -29736,5 +30025,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -29743,5 +30032,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -29750,5 +30039,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -29757,5 +30046,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -29764,5 +30053,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -29771,5 +30060,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -29778,5 +30067,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -29785,5 +30074,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -29792,8 +30081,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 "услуги"
@@ -29804,8 +30093,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 "форд"
@@ -29816,5 +30105,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -29823,8 +30112,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 "обръщало"
@@ -29835,9 +30124,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 "точка за връзка със спешна помощ"
@@ -29848,9 +30137,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 "речен бряг"
@@ -29861,8 +30150,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 "поток"
@@ -29873,8 +30162,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 "док"
@@ -29885,5 +30174,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29892,5 +30181,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29899,5 +30188,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29907,5 +30196,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29914,5 +30203,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29921,5 +30210,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29928,5 +30217,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29936,5 +30225,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29945,5 +30234,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -29953,7 +30242,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--man_made tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -29963,5 +30252,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -29971,5 +30260,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -29979,5 +30268,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -29988,5 +30277,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -29995,5 +30284,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -30003,5 +30292,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -30011,5 +30300,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -30019,5 +30308,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -30027,5 +30316,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -30035,5 +30324,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -30043,5 +30332,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -30051,5 +30340,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -30059,5 +30348,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -30067,18 +30356,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 "изкуствени съоръжения"
@@ -30088,9 +30377,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 ""
@@ -30101,7 +30390,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- railway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -30111,5 +30400,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -30118,5 +30407,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -30126,5 +30415,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -30133,5 +30422,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -30141,5 +30430,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -30149,10 +30438,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 "ЖП точка"
@@ -30163,5 +30452,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -30172,13 +30461,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 "ЖП railover"
@@ -30189,5 +30478,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -30197,5 +30486,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30208,5 +30497,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30214,7 +30503,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 "стара ЖП линия"
@@ -30225,5 +30514,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -30232,5 +30521,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -30239,5 +30528,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -30246,7 +30535,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aeroway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -30257,9 +30546,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 "въздушен транспорт"
@@ -30270,8 +30559,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 "терминал"
@@ -30282,5 +30571,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -30290,8 +30579,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 "Надземен_транспорт_тъмен"
@@ -30302,8 +30591,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 "Надземен_транспорт_светъл"
@@ -30314,5 +30603,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -30321,5 +30610,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -30328,7 +30617,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aerialway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -30338,5 +30627,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -30346,5 +30635,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -30354,5 +30643,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -30362,5 +30651,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -30370,10 +30659,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 "надземен транспорт"
@@ -30384,11 +30673,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 "лесна ски писта"
@@ -30399,9 +30688,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 "средно трудна ски писта"
@@ -30412,9 +30701,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 "ски писта за напреднали"
@@ -30425,9 +30714,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 "ски писта за експерти"
@@ -30438,9 +30727,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 "ски писта freeride"
@@ -30451,9 +30740,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 "ски писта за начинаещи"
@@ -30464,7 +30753,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--power tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -30474,5 +30763,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -30481,5 +30770,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -30489,5 +30778,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -30497,5 +30786,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -30505,5 +30794,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -30513,5 +30802,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -30521,5 +30810,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -30529,5 +30818,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -30537,5 +30826,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -30545,5 +30834,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -30553,5 +30842,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -30561,5 +30850,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -30569,15 +30858,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 "захранване"
@@ -30587,9 +30876,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 "кей"
@@ -30600,8 +30889,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 "тръбопровод"
@@ -30611,7 +30900,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--leisure tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -30621,5 +30910,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -30629,5 +30918,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -30637,5 +30926,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -30645,5 +30934,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -30653,5 +30942,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -30661,5 +30950,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -30669,5 +30958,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -30677,5 +30966,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -30685,5 +30974,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -30693,5 +30982,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -30701,5 +30990,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -30709,5 +30998,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -30717,5 +31006,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -30725,5 +31014,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -30733,5 +31022,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -30741,17 +31030,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 "отдих и развлечение"
@@ -30761,9 +31050,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 "яхт пристан"
@@ -30773,7 +31062,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--amenity tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -30783,5 +31072,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -30791,5 +31080,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -30799,5 +31088,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -30807,5 +31096,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -30815,5 +31104,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -30823,5 +31112,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -30831,5 +31120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -30839,5 +31128,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -30847,5 +31136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -30855,14 +31144,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 "Обществени услуги"
@@ -30872,5 +31161,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30880,5 +31169,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30888,5 +31177,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30896,5 +31185,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30904,5 +31193,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30912,5 +31201,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30920,5 +31209,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30928,5 +31217,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30936,5 +31225,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30944,5 +31233,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -30952,5 +31241,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -30960,14 +31249,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 "Обществен трафик"
@@ -30977,5 +31266,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -30984,5 +31273,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -30992,5 +31281,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -30999,5 +31288,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -31007,5 +31296,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -31015,5 +31304,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -31023,5 +31312,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -31030,5 +31319,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -31038,5 +31327,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -31046,5 +31335,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -31054,5 +31343,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -31062,5 +31351,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -31069,5 +31358,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -31076,5 +31365,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -31083,5 +31372,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -31090,5 +31379,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -31097,5 +31386,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -31104,5 +31393,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -31111,5 +31400,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -31118,5 +31407,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -31125,5 +31414,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -31132,5 +31421,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -31139,5 +31428,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -31146,5 +31435,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -31153,5 +31442,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -31161,5 +31450,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -31169,5 +31458,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -31177,5 +31466,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -31185,5 +31474,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -31193,5 +31482,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -31201,5 +31490,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -31209,5 +31498,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -31217,5 +31506,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -31225,5 +31514,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -31234,5 +31523,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -31242,5 +31531,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -31250,5 +31539,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -31258,5 +31547,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -31266,5 +31555,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -31274,5 +31563,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -31282,5 +31571,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -31290,5 +31579,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -31298,5 +31587,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -31306,5 +31595,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -31314,5 +31603,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -31322,5 +31611,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -31330,5 +31619,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -31338,5 +31627,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -31346,5 +31635,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -31354,5 +31643,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"/>
@@ -31362,5 +31659,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -31370,5 +31667,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -31378,5 +31675,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -31386,5 +31683,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -31393,27 +31690,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 "Обществено осветление"
@@ -31423,5 +31721,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -31431,5 +31729,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -31439,12 +31737,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 "светла_вода"
@@ -31454,5 +31752,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -31462,5 +31760,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -31470,5 +31768,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -31478,5 +31776,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -31486,5 +31784,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -31494,5 +31792,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -31502,11 +31800,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 "здравеопазване"
@@ -31516,7 +31814,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--shop tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -31526,5 +31824,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -31534,5 +31832,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -31542,5 +31840,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -31550,5 +31848,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -31558,5 +31856,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -31566,5 +31864,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -31574,5 +31872,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -31582,5 +31880,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -31590,5 +31888,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -31598,5 +31896,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -31606,5 +31904,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -31614,5 +31912,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -31622,5 +31920,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -31630,5 +31928,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -31638,5 +31936,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -31646,5 +31944,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -31654,5 +31952,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -31662,5 +31960,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -31670,5 +31968,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -31678,5 +31976,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -31686,5 +31984,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -31694,5 +31992,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -31702,5 +32000,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -31710,5 +32008,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -31718,5 +32016,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -31726,5 +32024,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -31734,5 +32032,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -31742,5 +32040,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -31750,5 +32048,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -31758,5 +32056,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -31766,5 +32064,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -31774,5 +32072,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -31782,5 +32080,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -31790,5 +32088,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -31798,5 +32096,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -31806,5 +32104,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -31814,5 +32112,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -31822,5 +32120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -31830,5 +32128,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -31838,5 +32136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -31846,5 +32144,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -31854,31 +32152,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 "магазин"
@@ -31888,7 +32186,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--tourism tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31898,5 +32196,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31906,5 +32204,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31914,5 +32212,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31922,5 +32220,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31930,5 +32228,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31938,5 +32236,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31946,12 +32244,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 "хотел"
@@ -31961,5 +32259,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -31969,5 +32267,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -31977,5 +32275,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -31985,5 +32283,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -31993,5 +32291,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -32001,5 +32299,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -32010,5 +32308,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -32018,5 +32316,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- information tags -->
 #. <rule>
@@ -32026,5 +32324,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -32034,5 +32332,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -32041,5 +32339,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -32048,13 +32346,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 "туризъм"
@@ -32064,7 +32362,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--historic tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -32074,5 +32372,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -32082,5 +32380,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -32090,5 +32388,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -32098,5 +32396,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -32106,5 +32404,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -32114,5 +32412,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -32122,5 +32420,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -32130,5 +32428,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -32138,13 +32436,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 "исторически"
@@ -32154,8 +32452,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 "кариера"
@@ -32166,8 +32464,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 "сметище"
@@ -32178,5 +32476,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -32186,8 +32484,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 "басейн"
@@ -32198,8 +32496,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 "двор ферма"
@@ -32210,6 +32508,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
-#. 
+#.
+#.
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -32219,8 +32517,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 "търговия на дребно"
@@ -32231,8 +32529,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 "индустрия"
@@ -32243,8 +32541,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 "индустриални развалини"
@@ -32255,8 +32553,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 "зелена площ"
@@ -32267,8 +32565,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 "ЖП"
@@ -32279,5 +32577,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -32287,7 +32585,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--military tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -32297,5 +32595,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -32305,5 +32603,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -32313,5 +32611,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -32321,11 +32619,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 "военни"
@@ -32336,8 +32634,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 "гробище"
@@ -32347,8 +32645,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 "връх"
@@ -32359,9 +32657,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 "ледник"
@@ -32371,9 +32669,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 "вулкан"
@@ -32383,5 +32681,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -32392,5 +32690,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -32400,5 +32698,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -32408,5 +32706,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -32416,5 +32714,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -32424,12 +32722,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 "природа"
@@ -32439,9 +32737,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 "храсталак"
@@ -32451,9 +32749,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 "пустош"
@@ -32463,9 +32761,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 "гориста местност"
@@ -32475,9 +32773,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 "кал"
@@ -32487,9 +32785,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 "плаж"
@@ -32500,5 +32798,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?
@@ -32524,5 +32822,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -32533,11 +32831,11 @@
 #. </rule>
 #. -->
-#. 
+#.
 #. <!--name tags -->
-#. 
+#.
 #. <!--preferences tags -->
-#. 
+#.
 #. <!--place tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -32547,5 +32845,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -32555,5 +32853,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -32563,5 +32861,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -32571,5 +32869,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -32579,5 +32877,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -32587,5 +32885,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -32595,5 +32893,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -32603,5 +32901,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -32611,5 +32909,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -32619,5 +32917,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -32627,5 +32925,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -32635,15 +32933,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 "място"
@@ -32653,9 +32951,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 ""
@@ -32746,5 +33044,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#. 
+#.
 #. Data type can be:
 #. node        - a node point
@@ -32752,28 +33050,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
@@ -32888,5 +33186,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#. 
+#.
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32899,5 +33197,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>
@@ -32922,6 +33220,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#. 
-#. 
+#.
+#.
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32930,6 +33228,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#. 
-#. 
+#.
+#.
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32944,6 +33242,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
@@ -32957,6 +33255,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
@@ -32976,6 +33274,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#. 
-#. 
+#.
+#.
 #. only for Japan
 #: build/trans_wms.java:39
@@ -32999,6 +33297,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
@@ -33011,5 +33309,4 @@
 msgstr "Сицилия - Италия"
 
-#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -33021,5 +33318,4 @@
 #~ " {0}"
 
-#, java-format
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
 #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
@@ -33027,7 +33323,7 @@
 #~ msgstr[1] "{0} Разширенията успешно обновени. Моля рестартирайте JOSM."
 
-#, java-format
 #~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded automatically."
+#~ "The plugin {0} seems to be broken or could not be downloaded "
+#~ "automatically."
 #~ msgstr ""
 #~ "Разширение {0} изглежда повредено или не може да бъде свалено автоматично."
@@ -33040,5 +33336,4 @@
 #~ "повторете опита си по-късно."
 
-#, java-format
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Невъзможно да се свали разширение: {0} от {1} достъпни"
@@ -33065,5 +33360,4 @@
 #~ msgstr "Намерен е елемент <nd> извън път."
 
-#, java-format
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr "Игнориране на път, понеже съдържа несъществуващ елемент: {0}\n"
@@ -33090,5 +33384,4 @@
 #~ msgstr "Неправилен код на точка"
 
-#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "За работа на модула е нужна по-нова версия на JOSM: {0}."
@@ -33099,6 +33392,6 @@
 #~ msgstr ""
 #~ "(Може да промените броя дни преди да се появи това предупреждение "
-#~ "отново<br>чрез задаването на конфигурационната опция "
-#~ "'pluginmanager.warntime'.)"
+#~ "отново<br>чрез задаването на конфигурационната опция 'pluginmanager."
+#~ "warntime'.)"
 
 #~ msgid "Unsaved Changes"
@@ -33132,14 +33425,13 @@
 #~ msgstr "Преместване"
 
-#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Моля, съобщете за грешката на адрес {0}"
 
 #~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before reporting "
-#~ "a bug."
+#~ "Try updating to the newest version of JOSM and all plugins before "
+#~ "reporting a bug."
 #~ msgstr ""
-#~ "Опитайте да обновите до най-нова версия на JOSM и на всички разширения преди "
-#~ "да съобщите за грешка."
+#~ "Опитайте да обновите до най-нова версия на JOSM и на всички разширения "
+#~ "преди да съобщите за грешка."
 
 #~ msgid "Be sure to include the following information:"
@@ -33148,6 +33440,6 @@
 #~ msgid "Include your steps to get to the error (as detailed as possible)!"
 #~ msgstr ""
-#~ "Укажете последователността от действия, която предизвика грешката (колкото "
-#~ "се може по-подробно!)"
+#~ "Укажете последователността от действия, която предизвика грешката "
+#~ "(колкото се може по-подробно!)"
 
 #~ msgid "x from"
@@ -33178,9 +33470,7 @@
 #~ msgstr "Невъзможно да се установи връзка със сървъра."
 
-#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "Автори: {0}"
 
-#, java-format
 #~ msgid "Layers: {0}"
 #~ msgstr "Слоеве: {0}"
@@ -33189,5 +33479,4 @@
 #~ msgstr "Разрешяване конфликти."
 
-#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Списък промени: {0}"
@@ -33196,5 +33485,4 @@
 #~ msgstr "име"
 
-#, java-format
 #~ msgid "Images for {0}"
 #~ msgstr "Изображения за {0}"
@@ -33203,13 +33491,10 @@
 #~ msgstr "Прочитане GPX..."
 
-#, java-format
 #~ msgid "GPS start: {0}"
 #~ msgstr "GPS Начало: {0}"
 
-#, java-format
 #~ msgid "current delta: {0}s"
 #~ msgstr "текуща разлика: {0} с."
 
-#, java-format
 #~ msgid "GPS end: {0}"
 #~ msgstr "GPS Край: {0}"
@@ -33223,5 +33508,4 @@
 #~ msgstr "Изображение"
 
-#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} в пределите на следата"
@@ -33257,5 +33541,4 @@
 #~ msgstr "оправена версия:"
 
-#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -33381,6 +33664,6 @@
 
 #~ msgid ""
-#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
-#~ "these will then show up in the WMS menu.\n"
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
 #~ "\n"
 #~ "You can also do this manually in the Advanced Preferences, using the "
@@ -33397,6 +33680,6 @@
 #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
 #~ "only need to input the relevant 'id'.\n"
-#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in "
-#~ "this example,replacing 73 with your image id: \n"
+#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
+#~ "in this example,replacing 73 with your image id: \n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -33421,6 +33704,6 @@
 #~ "За Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , ще се "
 #~ "нуждаете да въведете съответно подходящо 'id'.\n"
-#~ "За да добавите Metacarta Map Rectifier меню елемент, ръчно създайте URL по "
-#~ "примера по-долу, заменяйки 73 с вашето image id: \n"
+#~ "За да добавите Metacarta Map Rectifier меню елемент, ръчно създайте URL "
+#~ "по примера по-долу, заменяйки 73 с вашето image id: \n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -33441,5 +33724,4 @@
 #~ msgstr "Metacarta Map Rectifier image id"
 
-#, java-format
 #~ msgid "rectifier id={0}"
 #~ msgstr "rectifier id={0}"
@@ -33493,9 +33775,7 @@
 #~ msgstr "Моля задайте низ за търсене"
 
-#, java-format
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "Използване шаблон ''{0}'' от група ''{1}''"
 
-#, java-format
 #~ msgid "Use preset ''{0}''"
 #~ msgstr "Използване шаблон ''{0}''"
@@ -33520,6 +33800,6 @@
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version selected "
-#~ "in the history list."
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
 #~ msgstr ""
 #~ "Възстановяване състоянието на всички текущо избрани обекти до версията, "
@@ -33538,9 +33818,7 @@
 #~ msgstr "Не е намерено изображение с информация за времето."
 
-#, java-format
 #~ msgid "There is no EXIF time within the file \"{0}\"."
 #~ msgstr "Липсва EXIF време във файла \"{0}\"."
 
-#, java-format
 #~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
 #~ msgstr "Невъзможно да се прочете времето \"{0}\" от точка {1} x {2}"
@@ -33549,5 +33827,4 @@
 #~ msgstr "Въведете указаната дата (мм/дд/гггг ЧЧ:ММ:СС)"
 
-#, java-format
 #~ msgid "No time for point {0} x {1}"
 #~ msgstr "Не е указано време за точка {0} x {1}"
@@ -33578,6 +33855,7 @@
 #~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
 #~ msgstr ""
-#~ "Източник (URL или име файл) на файлове с дефиниции на шаблони за маркиране. "
-#~ "Вижте http://josm.openstreetmap.de/wiki/TaggingPresets за подробности."
+#~ "Източник (URL или име файл) на файлове с дефиниции на шаблони за "
+#~ "маркиране. Вижте http://josm.openstreetmap.de/wiki/TaggingPresets за "
+#~ "подробности."
 
 #~ msgid "Add a new tagging preset source to the list."
@@ -33597,5 +33875,6 @@
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you load\n"
+#~ "Parameters are read in the order they are specified, so make sure you "
+#~ "load\n"
 #~ "some data before --selection"
 #~ msgstr ""
@@ -33607,6 +33886,6 @@
 
 #~ 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 ""
 #~ "Грешка при активиране на обновените разширения. Проверете дали JOSM има "
@@ -33632,9 +33911,7 @@
 #~ msgstr "Повече от един път \"от\" са намерени."
 
-#, java-format
 #~ msgid "Unknown member type for ''{0}''."
 #~ msgstr "Неизвестен тип членство за ''{0}''."
 
-#, java-format
 #~ msgid "Way ''{0}'' with less than two points."
 #~ msgstr "Пътя ''{0}'' е с по-малко от две точки."
@@ -33643,45 +33920,34 @@
 #~ msgstr "Не е намерен път \"от\"."
 
-#, java-format
 #~ msgid "Unknown role ''{0}''."
 #~ msgstr "Неизвестна роля ''{0}''."
 
-#, java-format
 #~ msgid "No useful role ''{0}'' for Way ''{1}''."
 #~ msgstr "Няма подходяща роля ''{0}'' за Път ''{1}''."
 
-#, java-format
 #~ msgid "No outer way for multipolygon ''{0}''."
 #~ msgstr "Липсва външен път за мултиполигон ''{0}''."
 
-#, java-format
 #~ msgid "Style for inner way ''{0}'' equals multipolygon."
 #~ msgstr "Стилът за вътрешния път ''{0}'' се равнява на мултиполигон."
 
-#, java-format
 #~ msgid "Style for outer way ''{0}'' mismatches."
 #~ msgstr "Стилът за външния път ''{0}'' се разминава."
 
-#, java-format
 #~ msgid "Non-Way ''{0}'' in multipolygon."
 #~ msgstr "Не-Път ''{0}'' в мултиполигон."
 
-#, java-format
 #~ msgid "Intersection between ways ''{0}'' and ''{1}''."
 #~ msgstr "Пресичане между пътища ''{0}'' и ''{1}''."
 
-#, java-format
 #~ msgid "Inner way ''{0}'' is outside."
 #~ msgstr "Вътрешният път ''{0}'' се намира отвън."
 
-#, java-format
 #~ msgid "Style for restriction {0} not found."
 #~ msgstr "Стил за ограничение {0} не е намерен."
 
-#, java-format
 #~ msgid "Error: {0}"
 #~ msgstr "Грешка: {0}"
 
-#, java-format
 #~ msgid "Warning: {0}"
 #~ msgstr "Предупреждение: {0}"
@@ -33690,9 +33956,7 @@
 #~ msgstr "В релацията има празен член."
 
-#, java-format
 #~ msgid "multipolygon way ''{0}'' is not closed."
 #~ msgstr "мултиполигонен път ''{0}'' не е затворен."
 
-#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -33701,6 +33965,6 @@
 #~ "{0}"
 #~ msgstr ""
-#~ "Архив с разширението вече съществува. Да се свали ли текущата версия и да се "
-#~ "се изтрие съществуващия архив?\n"
+#~ "Архив с разширението вече съществува. Да се свали ли текущата версия и да "
+#~ "се се изтрие съществуващия архив?\n"
 #~ "\n"
 #~ "{0}"
@@ -33709,9 +33973,7 @@
 #~ msgstr "Път, обознаващ граница на област, не е затворен."
 
-#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Не може да се отвори директорията с предпочитания: {0}"
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -33742,13 +34004,13 @@
 
 #~ msgid ""
-#~ "You are about to delete nodes outside of the area you have "
-#~ "downloaded.<br>This can cause problems because other objects (that you don't "
-#~ "see) might use them.<br>Do you really want to delete?"
+#~ "You are about to delete nodes outside of the area you have downloaded."
+#~ "<br>This can cause problems because other objects (that you don't see) "
+#~ "might use them.<br>Do you really want to delete?"
 #~ msgstr ""
-#~ "Вие се каните да изтриете възли, намиращи се извън зоната, която сте свалили "
-#~ "от сървъра.<br>Това може да предизвика проблеми, защото други обекти (които "
-#~ "не виждате) може да ги използват.<br>Наистина ли искате да ги триете?"
-
-#, java-format
+#~ "Вие се каните да изтриете възли, намиращи се извън зоната, която сте "
+#~ "свалили от сървъра.<br>Това може да предизвика проблеми, защото други "
+#~ "обекти (които не виждате) може да ги използват.<br>Наистина ли искате да "
+#~ "ги триете?"
+
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Разрешаване {0} конфликти в {1} обекти"
@@ -33761,9 +34023,9 @@
 
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want to "
-#~ "combine them?"
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
 #~ msgstr ""
-#~ "Избраните пътища имат различни участия в релации.  Въпреки това искате ли да "
-#~ "ги обеденим?"
+#~ "Избраните пътища имат различни участия в релации.  Въпреки това искате ли "
+#~ "да ги обеденим?"
 
 #~ msgid "All the ways were empty"
@@ -33783,6 +34045,6 @@
 
 #~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this as "
-#~ "a bug."
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
 #~ msgstr ""
 #~ "Вътрешна грешка: невъзможно да се проверят условията без слой. Моля, "
@@ -33792,13 +34054,10 @@
 #~ msgstr "Зареди избраното"
 
-#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "Свързване с {0}..."
 
-#, java-format
 #~ msgid "Parsing error in URL: \"{0}\""
 #~ msgstr "Грешка на разбор от URL: \"{0}\""
 
-#, java-format
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "Грешка при четене от адрес URL: \"{0}\""
@@ -33809,5 +34068,6 @@
 #~ msgid "Please select one or more closed ways of at least four nodes."
 #~ msgstr ""
-#~ "Моля, изберете един или повече затворени пътя, състоящи се от поне 4 точки."
+#~ "Моля, изберете един или повече затворени пътя, състоящи се от поне 4 "
+#~ "точки."
 
 #~ msgid "Some of the nodes are (almost) in the line"
@@ -33833,5 +34093,4 @@
 #~ "Възможно е да се редактират само справочните страници на JOSM Online Help"
 
-#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Грешка при зареждане на страница {0}"
@@ -33865,15 +34124,14 @@
 #~ "Сигурни ли сте че искате да продължите?"
 
-#~ msgid "Are you sure?"
-#~ msgstr "Сигурни ли сте?"
-
-#, java-format
-#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
+#~ msgid ""
+#~ "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them all?"
+#~ "The selection contains {0} ways. Are you sure you want to simplify them "
+#~ "all?"
 #~ msgstr[0] ""
 #~ "Селекцията се състои от {0} път. Сигурни ли сте че искате да го опростите?"
 #~ msgstr[1] ""
-#~ "Селекцията се състои от {0} пътя. Сигурни ли сте че искате да ги опростите?"
+#~ "Селекцията се състои от {0} пътя. Сигурни ли сте че искате да ги "
+#~ "опростите?"
 
 #~ msgid "All images"
@@ -33968,5 +34226,4 @@
 #~ msgstr "Преместване нагоре"
 
-#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Редактор релации: {0}"
@@ -33985,5 +34242,4 @@
 #~ "имат история."
 
-#, java-format
 #~ msgid "Change the projection to {0} first."
 #~ msgstr "Променете първо проекцията до {0}."
@@ -33992,16 +34248,14 @@
 #~ msgstr "Невалидна проекция"
 
-#, java-format
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
 #~ "continue?"
 #~ msgstr ""
-#~ "Това действие ще изисква {0} индивидуални запитвания за сваляне. Желаете ли "
-#~ "да продължите?"
+#~ "Това действие ще изисква {0} индивидуални запитвания за сваляне. Желаете "
+#~ "ли да продължите?"
 
 #~ msgid "Update Data"
 #~ msgstr "Обновяване на данните"
 
-#, java-format
 #~ msgid "Found {0} matches of {1} in GPX track {2}"
 #~ msgstr "Открити {0} съвпадения на {1} в GPX следа {2}"
@@ -34011,16 +34265,16 @@
 
 #~ msgid ""
-#~ "An error occured while trying to match the photos to the GPX track. You can "
-#~ "adjust the sliders to manually match the photos."
+#~ "An error occured while trying to match the photos to the GPX track. You "
+#~ "can adjust the sliders to manually match the photos."
 #~ msgstr ""
-#~ "Възникна грешка при опит да се съотнесат снимките към GPX следата. Може да "
-#~ "промените настройките на ръчно съотнасяне на снимки."
-
-#, java-format
+#~ "Възникна грешка при опит да се съотнесат снимките към GPX следата. Може "
+#~ "да промените настройките на ръчно съотнасяне на снимки."
+
 #~ msgid "Offset between track and photos: {0}m {1}s"
 #~ msgstr "Разминаване между следата и снимките: {0}мин {1}сек"
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data layer?"
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
 #~ msgstr ""
 #~ "Не са открити данни за обновяване. Отваряли или зареждали ли сте слой с "
@@ -34073,19 +34327,19 @@
 #~ "import EXIF geotagged pictures."
 #~ msgstr ""
-#~ "Още едно geotag разширение за JOSM. Свързва снимки с GPS следи или импортира "
-#~ "EXIF гео-маркирани снимки."
+#~ "Още едно geotag разширение за JOSM. Свързва снимки с GPS следи или "
+#~ "импортира EXIF гео-маркирани снимки."
 
 #~ msgid ""
 #~ "The main feature of the plugin is the possibility to delete points of the "
-#~ "GPX track. This plugin can be used to prepare  tracks for uploading to OSM "
-#~ "eg. deleting uninteresting parts of track."
+#~ "GPX track. This plugin can be used to prepare  tracks for uploading to "
+#~ "OSM eg. deleting uninteresting parts of track."
 #~ msgstr ""
-#~ "Основното качество на разширението е възможността за изтриване на точки от "
-#~ "GPX следи. Това разширение може да се използва да подготви следа за качване "
-#~ "на OSM, примерно чрез изтриване на неинтересните части от следата."
+#~ "Основното качество на разширението е възможността за изтриване на точки "
+#~ "от GPX следи. Това разширение може да се използва да подготви следа за "
+#~ "качване на OSM, примерно чрез изтриване на неинтересните части от следата."
 
 #~ msgid ""
-#~ "Tools to work with authors/users. Selects map data that belongs to selected "
-#~ "user, opens browser showing selected author profile page."
+#~ "Tools to work with authors/users. Selects map data that belongs to "
+#~ "selected user, opens browser showing selected author profile page."
 #~ msgstr ""
 #~ "Инструменти за работа с автори/потребители. Избиране картови данни, които "
@@ -34097,9 +34351,9 @@
 
 #~ msgid ""
-#~ "Several utilities that make your life easier: e.g. simplify way, join areas, "
-#~ "jump to position."
+#~ "Several utilities that make your life easier: e.g. simplify way, join "
+#~ "areas, jump to position."
 #~ msgstr ""
-#~ "Няколко помощни инструмента, които облекчават живота: например опрастяване "
-#~ "на път, присъединяване на области, прескачане до позиция."
+#~ "Няколко помощни инструмента, които облекчават живота: например "
+#~ "опрастяване на път, присъединяване на области, прескачане до позиция."
 
 #~ msgid "Remove route nodes"
@@ -34118,5 +34372,4 @@
 #~ msgstr "Не може да се прочетат числова стойност от отговора"
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -34137,5 +34390,4 @@
 #~ msgstr "Възстановяне от изтриване на път..."
 
-#, java-format
 #~ msgid "Checking whether node {0} is gone ..."
 #~ msgstr "Проверка дали възел {0} е заминал..."
@@ -34144,9 +34396,7 @@
 #~ msgstr "Възстановяване от изтриване на релация..."
 
-#, java-format
 #~ msgid "Checking whether primitive {0} is gone ..."
 #~ msgstr "Проверка дали примитив {0} е заминал..."
 
-#, java-format
 #~ msgid "The date in file \"{0}\" could not be parsed."
 #~ msgstr "Невъзможно е да се прочете датата от файла \"{0}\""
@@ -34155,5 +34405,4 @@
 #~ msgstr "Конфликт в данните"
 
-#, java-format
 #~ msgid ""
 #~ "Current number of changes exceeds the max. number of changes, current is "
@@ -34178,5 +34427,4 @@
 #~ msgstr "Обновяване на примитива."
 
-#, java-format
 #~ msgid ""
 #~ "WARNING: launching browser windows for the first {0} of {1} selected "
@@ -34192,5 +34440,4 @@
 #~ msgstr "Забелязан е конфликт."
 
-#, java-format
 #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 #~ msgstr ""
@@ -34204,5 +34451,4 @@
 #~ msgstr "Примитивът вече е изтрит."
 
-#, java-format
 #~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
 #~ msgstr "Синтактична грешка: Шаблонът {0} в {1} е недопустим!"
@@ -34217,5 +34463,4 @@
 #~ msgstr "точки"
 
-#, java-format
 #~ msgid ""
 #~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
@@ -34224,6 +34469,6 @@
 #~ msgstr ""
 #~ "<html>Качването <strong>пропадна</strong> защото примитивът, който се "
-#~ "опитахте<br> да изтриете на съсрвъра вече е изтрит там.<br><br>Съобщението "
-#~ "за грешка е:<br>{0}</html>"
+#~ "опитахте<br> да изтриете на съсрвъра вече е изтрит там."
+#~ "<br><br>Съобщението за грешка е:<br>{0}</html>"
 
 #~ msgid "Deleted or moved primitives"
@@ -34233,23 +34478,20 @@
 #~ msgstr "Грешен брой параметри на оператора за точки."
 
-#, java-format
 #~ msgid "An error occurred while saving. Error is: {0}"
 #~ msgstr "Възникна грешка при записа. Грешката е: {0}"
 
 #~ msgid ""
-#~ "Enable to upload all changes in one request, disable to use one request per "
-#~ "changed primitive"
+#~ "Enable to upload all changes in one request, disable to use one request "
+#~ "per changed primitive"
 #~ msgstr ""
-#~ "Активирай за качване на всички промени в една заявка, Изключи за използване "
-#~ "на заявка за всяка променена примитива"
+#~ "Активирай за качване на всички промени в една заявка, Изключи за "
+#~ "използване на заявка за всяка променена примитива"
 
 #~ msgid "Can't search because there is no loaded data."
 #~ msgstr "Не може да се търси защото няма заредени данни"
 
-#, java-format
 #~ msgid "Incorrect value of id operator: {0}. Number is expected."
 #~ msgstr "Некоректна стойност на id оператора: {0}. Очаквано е число."
 
-#, java-format
 #~ msgid "removing reference from way {0}"
 #~ msgstr "премахване на справка от път {0}"
@@ -34279,5 +34521,4 @@
 #~ msgstr "Копиране на подразбиращите се"
 
-#, java-format
 #~ msgid "Plug-in named {0} is not available. Update skipped."
 #~ msgstr "Добавката {0} не е достъпна. Обновяването е пропуснато."
@@ -34286,11 +34527,10 @@
 #~ msgstr "Още подробности"
 
-#, java-format
 #~ msgid "Deleting layer {0} of {1}"
 #~ msgstr "Изтриване слой {0} от {1}"
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still want "
-#~ "to merge them?"
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
 #~ msgstr ""
 #~ "Избраните точки участват в различни връзки. Искате ли да ги обедините, "
@@ -34303,9 +34543,7 @@
 #~ msgstr "Не е намерен примитив с id = {0} и версия = {1} в тази база данни"
 
-#, java-format
 #~ msgid "Plugin {0} requires JOSM update to version {1}."
 #~ msgstr "Добавката {0} изисква програмата JOSM да бъде обновена до {1}."
 
-#, java-format
 #~ msgid ""
 #~ "Loading of {0} plugin was requested. This plugin is no longer required."
@@ -34313,5 +34551,4 @@
 #~ "Зареждането на добавката {0} беше заявено, но тя не се изисква повече."
 
-#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Добавката не е открита: {0}."
@@ -34323,5 +34560,4 @@
 #~ msgstr "Използване на нов списък с промени и затваряне"
 
-#, java-format
 #~ msgid ""
 #~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
@@ -34336,10 +34572,8 @@
 #~ msgstr "Винаги да се премества и този прозорец да не се показва повече"
 
-#, java-format
 #~ msgid "Use the existing changeset {0} and close it after upload"
 #~ msgstr ""
 #~ "Използване на съществуващия списък с промени {0}. След качване се затваря."
 
-#, java-format
 #~ msgid "Use the existing changeset {0} and leave it open"
 #~ msgstr ""
@@ -34356,48 +34590,42 @@
 #~ msgstr "Няма отворен списък с промени. Отваряме нов списък ..."
 
-#, java-format
 #~ msgid ""
 #~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
 #~ "resolve them first.</html>"
 #~ msgstr ""
-#~ "<html>Има неразрешени конфликти в слой ''{0}''.<br>Трябва да ги "
-#~ "разрешите.</html>"
-
-#, java-format
+#~ "<html>Има неразрешени конфликти в слой ''{0}''.<br>Трябва да ги разрешите."
+#~ "</html>"
+
 #~ msgid ""
 #~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
 #~ "nodes or range, for example nodes:10-20"
 #~ msgstr ""
-#~ "Некоректна стойност на оператора за възли: {0}. Операторът за възли очаква "
-#~ "числова стойност, възел или диапазон, например, 10-20"
-
-#, java-format
+#~ "Некоректна стойност на оператора за възли: {0}. Операторът за възли "
+#~ "очаква числова стойност, възел или диапазон, например, 10-20"
+
 #~ msgid ""
 #~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
 #~ "relation?</html>"
 #~ msgstr ""
-#~ "<html>Избраният обект \"{0}\" е част от релация \"{1}\".<br>Да го изтрием ли "
-#~ "от релацията?</html>"
-
-#, java-format
+#~ "<html>Избраният обект \"{0}\" е част от релация \"{1}\".<br>Да го изтрием "
+#~ "ли от релацията?</html>"
+
 #~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-#~ "from relation?</html>"
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
 #~ msgstr ""
-#~ "<html>Избраният обект \"{0}\" е част от релация \"{1}\" с роля {2}.<br>Да го "
-#~ "изтрием ли от релацията?</html>"
-
-#, java-format
+#~ "<html>Избраният обект \"{0}\" е част от релация \"{1}\" с роля {2}.<br>Да "
+#~ "го изтрием ли от релацията?</html>"
+
 #~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr ""
 #~ "Страницата с помощ липсва. Създайте я на <A HREF=\"{0}\">английски</A>."
 
-#, java-format
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
 #~ msgstr ""
-#~ "Страницата с помощ липсва. Създайте я на <A HREF=\"{0}\">английски</A> или "
-#~ "на <A HREF=\"{1}\">вашият език</A>."
+#~ "Страницата с помощ липсва. Създайте я на <A HREF=\"{0}\">английски</A> "
+#~ "или на <A HREF=\"{1}\">вашият език</A>."
 
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
@@ -34406,27 +34634,22 @@
 
 #~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
 #~ msgstr ""
-#~ "Липсва страница с помощ. Създайте я на <A HREF=\"{0}\">английски</A> или <A "
-#~ "HREF=\"{1}\">на вашия език</A>."
-
-#, java-format
+#~ "Липсва страница с помощ. Създайте я на <A HREF=\"{0}\">английски</A> или "
+#~ "<A HREF=\"{1}\">на вашия език</A>."
+
 #~ msgid "Parameter ''{0}'' must not be null."
 #~ msgstr "Параметърът {0} не трябва да е празен"
 
-#, java-format
 #~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 #~ msgstr "очакваше се OsmDataLayer или GpxLayer. Имаме ''{0}''."
 
-#, java-format
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "неочаквана върната стойност {0}"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
 #~ msgstr "параметъра се очаква да е ''{0}'' > 0 , получено ''{1}''"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 #~ msgstr "параметърът ''{0}'' е неприемлив клас, имаме: ''{1}''"
@@ -34444,9 +34667,7 @@
 #~ msgstr "няма намерена последна версия. Историята е празна."
 
-#, java-format
 #~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
 #~ msgstr "Параметърът 'col' трябва да е 0 или 1. Имаме: {0}"
 
-#, java-format
 #~ msgid "Index out of bounds. Got {0}."
 #~ msgstr "индекс извън границите. Имаме: {0}"
@@ -34455,13 +34676,10 @@
 #~ msgstr "Показване историята на избрания примитив"
 
-#, java-format
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Не може да се прочете \"{0}\""
 
-#, java-format
 #~ msgid "Expected ID >= 0. Got {0}."
 #~ msgstr "Очакваше се ID >= 0. Имаме: {0}."
 
-#, java-format
 #~ msgid "Parameter ''{0}'' must not be empty."
 #~ msgstr "Параметърът ''{0}'' не трябва да е празен."
Index: /applications/editors/josm/i18n/po/cs.po
===================================================================
--- /applications/editors/josm/i18n/po/cs.po	(revision 21970)
+++ /applications/editors/josm/i18n/po/cs.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-14 03:10+0000\n"
+"POT-Creation-Date: 2010-06-23 22:47+0200\n"
+"PO-Revision-Date: 2010-06-16 12:10+0000\n"
 "Last-Translator: Martin Petricek <singularita@gmail.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-06-15 16:17+0000\n"
+"X-Launchpad-Export-Date: 2010-06-23 20:23+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -23,5 +23,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
@@ -93,5 +93,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
@@ -253,5 +253,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
@@ -274,5 +274,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
@@ -280,6 +280,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
@@ -288,4 +290,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
@@ -323,6 +327,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 ""
 "<html>Nejsou zde žádné vrstvy pro zdrojovou vrstvu<br>''{0}''<br>které by "
@@ -348,9 +352,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
@@ -410,4 +414,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
@@ -447,5 +452,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 "Informace"
@@ -656,5 +661,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
@@ -669,5 +674,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 "Smazat"
@@ -749,5 +754,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:58
 msgid "Choose the OSM object type"
-msgstr ""
+msgstr "Vyberte typ OSM objektu"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63
@@ -780,5 +785,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:99
 msgid "Invalid ID specified. Cannot download object."
-msgstr ""
+msgstr "Specifikováno neplatné ID. Nelze stáhnout objekt."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29
@@ -916,4 +921,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 ""
@@ -925,4 +931,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 "Toto může védst k náhodnému smazání uzlů."
@@ -1225,6 +1232,5 @@
 #, java-format
 msgid "<html>Cannot open directory ''{0}''.<br>Please select a file.</html>"
-msgstr ""
-"<html>Nelze otevřít adresář ''{0}''.<br>Prosím vyberte soubor.</html>"
+msgstr "<html>Nelze otevřít adresář ''{0}''.<br>Prosím vyberte soubor.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:190
@@ -1484,6 +1490,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
@@ -1510,4 +1516,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
@@ -1516,6 +1524,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 "Chyba"
@@ -1631,6 +1639,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 ""
 "Zobrazit zprávu o stavu s užitečnými informacemi, které se mohou přiložit k "
@@ -1668,8 +1675,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 "Ano,smazat body"
 
 #: ../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 "Smazat body mimo staženou oblast dat"
@@ -1678,5 +1687,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 "Ne, zrušit"
@@ -1684,16 +1694,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 "Zrušit operaci"
 
 #: ../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 "Chcete je přesto smazat?"
 
 #: ../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 "Smazat body mimo oblast s daty?"
 
 #: ../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 "Vyberte alespoň jednu cestu k zjednodušení."
@@ -1702,13 +1717,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 "Ano"
 
 #: ../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 "Zjednodušit všechny vybrané cesty"
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:126
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:89
 #, java-format
 msgid ""
@@ -1718,8 +1736,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 "Zjednodušit cesty?"
 
 #: ../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"
@@ -1730,4 +1750,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)"
@@ -1797,7 +1818,7 @@
 "should verify this and correct it when necessary.</html>"
 msgstr ""
-"<html>Relace založená na rolích byla zkopírována na všechny nové "
-"cesty.<br>Mělo by být ověřeno, zda je zkopírování správné a případně "
-"opraveno.</html>"
+"<html>Relace založená na rolích byla zkopírována na všechny nové cesty."
+"<br>Mělo by být ověřeno, zda je zkopírování správné a případně opraveno.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
@@ -1866,6 +1887,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 ""
 "* Jeden uzel používaný více než jednou cestou a jednu z těchto cest, nebo"
@@ -1909,6 +1929,7 @@
 msgid "Dupe {0} node into {1} nodes"
 msgid_plural "Dupe {0} nodes into {1} nodes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Duplikace {0} uzlu do {1} uzlů"
+msgstr[1] "Duplikace {0} uzlů do {1} uzlů"
+msgstr[2] "Duplikace {0} uzlů do {1} uzlů"
 
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
@@ -1939,9 +1960,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)"
@@ -1958,5 +1979,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
@@ -2020,5 +2041,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 "Žádné změny k nahrání."
@@ -2036,14 +2056,14 @@
 msgstr "Nahrát veškeré aktuálně vybrané změny na OSM server."
 
-#: ../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 "Kontroluji rodiče smazaných objektů"
 
-#: ../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 "Načítám rodiče ''{0}''"
 
-#: ../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 "Kontroluji na smazané rodiče v lokálních datech"
@@ -2303,5 +2323,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
@@ -2419,6 +2439,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 ""
 
@@ -2555,5 +2575,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."
@@ -2632,5 +2652,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
-msgstr ""
+msgstr "<b>oneway?</b> - oneway=yes, true, 1 nebo on"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
@@ -2645,6 +2665,5 @@
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
-msgstr ""
-"<b>type:</b> - typ objektu (<b>node</b>, <b>way</b>, <b>relation</b>)"
+msgstr "<b>type:</b> - typ objektu (<b>node</b>, <b>way</b>, <b>relation</b>)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
@@ -2674,10 +2693,14 @@
 "assigned changeset)"
 msgstr ""
+"<b>changeset:</b>... - objekt s daným id sady změn (0 objekty bez přidělené "
+"sady změn)"
 
 #: ../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)"
-msgstr ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
+"min-max)"
+msgstr ""
+"<b>nodes:</b>... - objekt s daným počtem uzlů (nodes:počet nebo nodes:min-"
+"max)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
@@ -2686,8 +2709,9 @@
 "max)"
 msgstr ""
+"<b>tags:</b>... - objekt s daným počtem tagů (tags:počet nebo tags:min-max)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
 msgid "<b>role:</b>... - object with given role in a relation"
-msgstr ""
+msgstr "<b>role:</b>... - objekt s danou rolí v relaci"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
@@ -2951,10 +2975,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
@@ -3079,5 +3107,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
@@ -3159,11 +3187,11 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231
 msgid ""
-"You are about to delete nodes outside of the area you have "
-"downloaded.<br>This can cause problems because other objects (that you do "
-"not see) might use them.<br>Do you really want to delete?"
+"You are about to delete nodes outside of the area you have downloaded."
+"<br>This can cause problems because other objects (that you do not see) "
+"might use them.<br>Do you really want to delete?"
 msgstr ""
 "Chystáte se smazat uzly mimo oblast, jež jste stáhli.<br>To může způsobit "
-"problémy, protože jiné objekty (které nevidíte) je mohou "
-"používat.<br>Opravdu je chcete smazat?"
+"problémy, protože jiné objekty (které nevidíte) je mohou používat."
+"<br>Opravdu je chcete smazat?"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
@@ -3209,11 +3237,11 @@
 msgstr[2] "Přesunout uzly {0}"
 
-#: ../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 "Odstraněný objekt ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111
 #, java-format
 msgid "Purged {0} object"
@@ -3223,5 +3251,5 @@
 msgstr[2] "Odstraněno {0} objektů"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 #, java-format
 msgid ""
@@ -3232,5 +3260,5 @@
 "{1}"
 
-#: ../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}"
@@ -3273,6 +3301,7 @@
 msgid "Undelete {0} primitive"
 msgid_plural "Undelete {0} primitives"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Obnovit {0} objekt"
+msgstr[1] "Obnovit {0} objekty"
+msgstr[2] "Obnovit {0} objektů"
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38
@@ -3441,6 +3470,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 ""
 
@@ -3526,5 +3555,5 @@
 #. *
 #. * the decimal format 999.999
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3533,5 +3562,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3540,5 +3569,5 @@
 #. *
 #. * coordinates East/North
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3585,4 +3614,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}"
@@ -3594,29 +3626,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 ""
 
@@ -3644,5 +3670,5 @@
 msgctxt "filter"
 msgid "I"
-msgstr ""
+msgstr "I"
 
 #. column header: filter mode
@@ -3650,5 +3676,5 @@
 msgctxt "filter"
 msgid "M"
-msgstr ""
+msgstr "M"
 
 #. translators notes must be in front
@@ -3696,19 +3722,19 @@
 "</p><p>Uzavřete filtrovací dialog pro zobrazení všech objektů.<p></html>"
 
-#: ../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 "objekt s id=0 nemůže být neviditelný"
 
-#: ../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 "očekáváno id > 0. Nalezeno {0}"
 
-#: ../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 "očekávána verze > 0. Nalezena {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:795
 #, java-format
 msgid ""
@@ -3717,5 +3743,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 "
@@ -3723,5 +3749,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 ""
@@ -3780,7 +3806,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
 #, java-format
-msgid ""
-"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
-msgstr ""
+msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgstr "Nelze srovnat objekt s ID ''{0}'' s objektem s ID ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
@@ -3794,5 +3819,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 "vybráno"
@@ -3956,6 +3981,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 "<html>Nelze načíst záložky z<br>''{0}''<br>Chyba: {1}</html>"
 
@@ -4023,9 +4047,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:173
 msgid "public transport"
-msgstr ""
+msgstr "veřejná doprava"
 
 #. color tiger_data
 #. </rule>
-#. 
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4035,5 +4059,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4042,5 +4066,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4049,5 +4073,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4056,5 +4080,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4063,5 +4087,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4070,9 +4094,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--annotation tags -->
-#. 
+#.
 #. <!--"work in progress" tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="building"/>
@@ -4081,5 +4105,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 "budova"
@@ -4118,5 +4142,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:157
 msgid "Illegal Data"
-msgstr ""
+msgstr "Neplatná data"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
@@ -4167,5 +4191,5 @@
 msgstr "Objekt smazán"
 
-#: ../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
@@ -4189,5 +4213,5 @@
 #, java-format
 msgid "Expected non-empty value for parameter ''{0}'', got ''{1}''"
-msgstr ""
+msgstr "Očekávána neprázdná hodnota pro parametr ''{0}'', nalezeno ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
@@ -4393,5 +4417,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
@@ -4400,4 +4424,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
@@ -4542,6 +4567,5 @@
 msgid ""
 "partial: different selected objects have different values, do not change"
-msgstr ""
-"částečně vybráno: vlastnost je u vybraných objektů nastavena rozdílně"
+msgstr "částečně vybráno: vlastnost je u vybraných objektů nastavena rozdílně"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:101
@@ -4605,5 +4629,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
@@ -4644,6 +4668,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 ""
 "<html>Alternativně můžete zadat <strong>adresu</strong> konkrétní dlaždice "
@@ -4678,5 +4702,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"
@@ -4685,5 +4709,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"
@@ -4692,5 +4716,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"
@@ -4860,6 +4884,5 @@
 "List of merged elements. They will replace the my elements when the merge "
 "decisions are applied."
-msgstr ""
-"Seznam sloučených elementů. Nahradí mé elementy po potvrzení sloučení."
+msgstr "Seznam sloučených elementů. Nahradí mé elementy po potvrzení sloučení."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292
@@ -4892,6 +4915,5 @@
 "Copy my selected elements before the first selected element in the list of "
 "merged elements."
-msgstr ""
-"Kopírovat mé vybrané elementy na začátek seznamu slučovaných elementů"
+msgstr "Kopírovat mé vybrané elementy na začátek seznamu slučovaných elementů"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:515
@@ -4910,8 +4932,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566
-msgid ""
-"Copy their selected elements to the end of the list of merged elements."
-msgstr ""
-"Kopírovat cizí vybrané elementy na konec seznamu slučovaných elementů"
+msgid "Copy their selected elements to the end of the list of merged elements."
+msgstr "Kopírovat cizí vybrané elementy na konec seznamu slučovaných elementů"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:588
@@ -4994,6 +5014,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their "
-"entries.</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 "<html>Kliněte <strong>{0}</strong> pro zahájení slučování mých a cizích "
@@ -5003,6 +5023,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their "
-"entries.</html>"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
+"html>"
 msgstr ""
 "<html>Kliněte <strong>{0}</strong> pro dokončení slučování mých a cizích "
@@ -5055,14 +5075,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
-msgstr ""
-"sloučené body nejsou dosud zmražené. Nelze vytvořit příkaz pro řešení"
+msgstr "sloučené body nejsou dosud zmražené. Nelze vytvořit příkaz pro řešení"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464
 #, java-format
 msgid ""
-"<html>An error occurred while communicating with the server<br>Details: "
-"{0}</html>"
-msgstr ""
-"<html>Při komunikaci se serverem doslo k chybě<br>Detaily: {0}</html>"
+"<html>An error occurred while communicating with the server<br>Details: {0}</"
+"html>"
+msgstr "<html>Při komunikaci se serverem doslo k chybě<br>Detaily: {0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
@@ -5140,5 +5158,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341
 msgid "Referenced by:"
-msgstr ""
+msgstr "Odkazováno z:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377
@@ -5234,6 +5252,6 @@
 "dataset.<br>Do you agree?</html>"
 msgstr ""
-"<html>JOSM odstraní lokální prvek s id {0}<br>z datové "
-"sady.<br>Souhlasíte?</html>"
+"<html>JOSM odstraní lokální prvek s id {0}<br>z datové sady.<br>Souhlasíte?</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685
@@ -5252,6 +5270,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:121
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
-msgstr ""
-"sloučené body nejsou dosud zmražené. Nelze vytvořit příkaz pro řešení"
+msgstr "sloučené body nejsou dosud zmražené. Nelze vytvořit příkaz pro řešení"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35
@@ -5283,10 +5300,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"
@@ -5295,10 +5314,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
@@ -5352,5 +5373,5 @@
 #, java-format
 msgid "Conflicts when merging nodes - target node is ''{0}''"
-msgstr ""
+msgstr "Konflikt při spojování uzlů - cílový uzel je ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:282
@@ -5380,4 +5401,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 "nic"
@@ -5394,5 +5416,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68
 msgid "Please decide which values to keep"
-msgstr ""
+msgstr "Rozhodněte se, které hodnoty nechat"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:73
@@ -5502,5 +5524,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
 msgid "Undecided"
-msgstr ""
+msgstr "Nerozhodnuto"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
@@ -5558,8 +5580,7 @@
 "<html>Slučované cesty jsou členy jedné nebo více relací. Prosím rozhodněte v "
 "jakých relacích chcete jejich členství <strong>zachovat</strong> a z jakých "
-"je chcete <strong>odstranit</strong>.<br>Standardně se "
-"<strong>zachová</strong> první cesta a ostatní budou ze stejných relací "
-"<strong>odstraněny</strong>: sloučená cesta zaujme místo původní cesty v "
-"relaci.</html>"
+"je chcete <strong>odstranit</strong>.<br>Standardně se <strong>zachová</"
+"strong> první cesta a ostatní budou ze stejných relací <strong>odstraněny</"
+"strong>: sloučená cesta zaujme místo původní cesty v relaci.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
@@ -5604,7 +5625,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 ""
 "<html>Vybere zobrazení sad změn pouze pro vybrané objekty.<br>Zrušení výběru "
@@ -5631,6 +5652,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 "Stáhnout informace o vybraných sadách změn z OSM serveru"
 
@@ -5646,5 +5666,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:417
 msgid "Open a web page for each selected changeset"
-msgstr ""
+msgstr "Otevřít www stránku pro každou vybranou sadu změn"
 
 #. Strings in JFileChooser
@@ -5676,5 +5696,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
@@ -5707,5 +5727,5 @@
 #, java-format
 msgid "Conflicts: {0} unresolved"
-msgstr ""
+msgstr "Konflikty: {0} nevyřešeno"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
@@ -5749,10 +5769,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 ""
 
@@ -5775,5 +5794,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
@@ -5781,5 +5800,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 "Přidat"
@@ -5828,5 +5847,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 "Historie"
@@ -6025,5 +6044,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:299
 msgid "Search for objects"
-msgstr ""
+msgstr "Hledat objekty"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:353
@@ -6039,17 +6058,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:419
 msgid "Call editor for relation"
-msgstr ""
+msgstr "Vyvolat editor na relaci"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:420
 msgid "Call relation editor for selected relation"
-msgstr ""
+msgstr "Vyvolat editor relací na vybranou relaci"
 
 #: ../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 "Vybrat relaci v seznamu relací."
@@ -6393,5 +6412,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:52
 msgid "Deleted"
-msgstr ""
+msgstr "Smazáno"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:32
@@ -7337,5 +7356,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:47
 msgid "Enter a changeset id"
-msgstr ""
+msgstr "Zadejte id sady změn"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:79
@@ -7355,5 +7374,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java:48
 msgid "Please enter an integer value > 0"
-msgstr ""
+msgstr "Prosím, zadejte celé číslo > 0"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
@@ -7426,5 +7445,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
 msgid "Please enter a valid user ID"
-msgstr ""
+msgstr "Prosím, zadejte platné ID uživatele"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
@@ -7434,5 +7453,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
 msgid "Please enter a non-empty user name"
-msgstr ""
+msgstr "Zadejte neprázdné jméno uživatele"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
@@ -7511,11 +7530,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
 msgid "Please enter an non-empty user name"
-msgstr ""
+msgstr "Prosím, zadejte neprázdné jméno uživatele"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
 #, 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 ""
 
@@ -7539,13 +7558,13 @@
 #: ../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 ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:147
 msgid "<html>Download the latest changesets</html>"
-msgstr ""
+msgstr "<html>Stáhnout nejnovější sady změn</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:154
@@ -7554,8 +7573,10 @@
 "user name in the preferences first.</em></html>"
 msgstr ""
+"<html>Stáhnout moje otevřené sady změn<br><em>Vypnuto. Prosím, zadejte "
+"nejprve v nastavení vaše uživatelské jméno pro OSM.</em></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:157
 msgid "<html>Download my open changesets</html>"
-msgstr ""
+msgstr "<html>Stáhnout moje otevřené sady změn</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:165
@@ -7660,34 +7681,35 @@
 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 "Přidat vlastnosti"
 
-#: ../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."
 msgid_plural "This will change up to {0} objects."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:194
+msgstr[0] "Toto změní {0} objekt."
+msgstr[1] "Toto změní {0} objekty."
+msgstr[2] "Toto změní {0} objektů."
+
+#: ../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
+msgstr "Prázdná hodnota smaže tag."
+
+#: ../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 "<různé>"
 
-#: ../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 "Změnit hodnoty ?"
 
-#: ../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"
@@ -7697,5 +7719,5 @@
 msgstr[2] "Změnit vlastnosti až  {0} objektů."
 
-#: ../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."
@@ -7705,79 +7727,79 @@
 msgstr[2] "Toto změní až  {0} objektů."
 
-#: ../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 "Prosím zvolte klíč"
 
-#: ../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 "Vyberte prosím hodnotu"
 
-#: ../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 "Vyberte objekty, u kterých chcete změnit vlastnosti."
 
-#: ../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 "Vlastnosti/Členství"
 
-#: ../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 "Vlastnosti pro zvolené objekty"
 
 #. 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 "Člen"
 
-#: ../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 "Pozice"
 
-#: ../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 "Vlastnosti: {0} / Členství: {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 "Vlastnosti / Členství"
 
-#: ../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 "Změnit relaci"
 
-#: ../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 "Odstranit z relace"
 
-#: ../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 "Opravdu smazat výběr z relace {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 "Smaže zvolený klíč ve všech objektech"
 
-#: ../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 "Smazat vlastnosti"
 
-#: ../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 "Přidat nový pár klíč/hodnota ke všem objektům"
 
-#: ../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 "Změnit hodnotu zvoleného klíče pro všechny objekty"
 
-#: ../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 "Vybrat relaci"
 
-#: ../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 ""
+msgstr "Vyberte relaci v hlavním výběru."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
@@ -7864,5 +7886,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
 msgid "Download relations"
-msgstr ""
+msgstr "Stáhnout relace"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
@@ -7895,6 +7917,6 @@
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
-"relation itself.<br>This creates circular dependencies and is "
-"discouraged.<br>How do you want to proceed with circular dependencies?</html>"
+"relation itself.<br>This creates circular dependencies and is discouraged."
+"<br>How do you want to proceed with circular dependencies?</html>"
 msgstr ""
 "<html>V této relaci je minimálně jeden prvek odkazující<br>na právě tuto "
@@ -7915,6 +7937,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 ""
 "<html>Relace již obsahuje minimálně jeden prvek odkazující na<br>prvek "
@@ -7933,12 +7955,11 @@
 msgstr ""
 "<html>POukoušíte se vložit relaci samu do sebe.<br><br>Toto vytvoří cyklický "
-"odkaz a proto není taková úprava povolena.<br>Přeskakuji relaci "
-"''{0}''.</html>"
+"odkaz a proto není taková úprava povolena.<br>Přeskakuji relaci ''{0}''.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
-msgstr ""
-"Přidat všechny vybrané prvky z aktuální datové sady před prvního člena"
+msgstr "Přidat všechny vybrané prvky z aktuální datové sady před prvního člena"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697
@@ -8004,13 +8025,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
 msgid "Reverse the order of the relation members"
-msgstr ""
+msgstr "Obrátí pořadí členů relace"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
 msgid "Reverse"
-msgstr ""
+msgstr "Obrátit"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
 msgid "Relation Editor: Reverse"
-msgstr ""
+msgstr "Editor relací: Obrátit"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927
@@ -8080,7 +8101,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 ""
 
@@ -8197,5 +8217,5 @@
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
+msgstr "Varování: Ignoruji výjimku, protože úkol je přerušen. Výjimka: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
@@ -8243,4 +8263,5 @@
 "Warning: ignoring exception because task was cancelled. Exception was: {0}"
 msgstr ""
+"Varování: Ignoruji výjimku, protože úkol byl přerušen. Výjimka byla: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:70
@@ -8340,5 +8361,5 @@
 #, java-format
 msgid "The string ''{0}'' is not a valid double value."
-msgstr ""
+msgstr "Řetězec ''{0}'' není platná hodnota pro reálné číslo (double)."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
@@ -8417,7 +8438,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 ""
 
@@ -8544,6 +8564,5 @@
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr ""
-"Nepodařilo se načíst CSS soubor ''help-browser.css''. Výjimka je: {0}"
+msgstr "Nepodařilo se načíst CSS soubor ''help-browser.css''. Výjimka je: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183
@@ -8559,13 +8578,13 @@
 "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>"
-msgstr ""
-"<html><p class=\"warning-header\">Nápověda k vybranému tématu "
-"neexistuje</p><p class=\"warning-body\">Nápověda na téma  "
-"<strong>{0}</strong> není dosud dostupná. Chybí jak vaše lokální jazyková "
-"verze ({1}) tak verze anglická.<br><br>Prosíme pomozte vylepšit JOSM a "
-"doplňte chybějící informace. Můžete upravovat <a href=\"{2}\">nápovědu ve "
-"vašem jazyce ({1})</a> a v <a href=\"{3}\">angličtině</a>.</p></html>"
+"your local language ({1})</a> and the <a href=\"{3}\">help topic in english</"
+"a>.</p></html>"
+msgstr ""
+"<html><p class=\"warning-header\">Nápověda k vybranému tématu neexistuje</"
+"p><p class=\"warning-body\">Nápověda na téma  <strong>{0}</strong> není "
+"dosud dostupná. Chybí jak vaše lokální jazyková verze ({1}) tak verze "
+"anglická.<br><br>Prosíme pomozte vylepšit JOSM a doplňte chybějící "
+"informace. Můžete upravovat <a href=\"{2}\">nápovědu ve vašem jazyce ({1})</"
+"a> a v <a href=\"{3}\">angličtině</a>.</p></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
@@ -8574,6 +8593,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 ""
 "<html><p class=\"error-header\">Při získávání nápovědy došlo k chybě</p><p "
@@ -8739,5 +8758,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242
 msgid "Open a history browser with the history of this node"
-msgstr ""
+msgstr "Otevřít prohlížení historie s historií tohoto uzlu"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78
@@ -8754,5 +8773,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60
 msgid "not present"
-msgstr ""
+msgstr "nepřítomno"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:56
@@ -8765,4 +8784,5 @@
 "<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
 msgstr ""
+"<html>Verze <strong>{0}</strong> aktuálně editovaná ve vrstvě ''{1}''</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:98
@@ -8770,6 +8790,5 @@
 msgid ""
 "<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
-msgstr ""
-"<html>Verze <strong>{0}</strong> vytvořená <strong>{1}</strong></html>"
+msgstr "<html>Verze <strong>{0}</strong> vytvořená <strong>{1}</strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119
@@ -8808,5 +8827,5 @@
 #, java-format
 msgid "Version {0} currently edited in data layer ''{1}''"
-msgstr ""
+msgstr "Verze {0} aktuálně editovaná ve vrstvě ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20
@@ -8853,9 +8872,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 ""
 "<html>Aktualizace <strong>selhala</strong>, protože na serveru je novější "
@@ -8877,14 +8895,13 @@
 msgid ""
 "<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click "
-"<strong>{0}</strong> to synchronize the entire local dataset with the "
-"server.<br>Click <strong>{1}</strong> to abort and continue "
-"editing.<br></html>"
+"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
+"</strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{1}</strong> to abort and continue editing.<br></html>"
 msgstr ""
 "<html>Aktualizace <strong>selhala</strong>, protože na serveru je novější "
-"verze jednoho z vašich<br> bodů, cest nebo relací.<br><br>Klikněte "
-"<strong>{0}</strong> pro synchronizaci kompletní lokální datové sady se "
-"serverem.<br>Klikněte <strong>{1}</strong> pro přerušení a pokračování "
-"editace.<br></html>"
+"verze jednoho z vašich<br> bodů, cest nebo relací.<br><br>Klikněte <strong>"
+"{0}</strong> pro synchronizaci kompletní lokální datové sady se serverem."
+"<br>Klikněte <strong>{1}</strong> pro přerušení a pokračování editace.<br></"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194
@@ -8905,5 +8922,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214
 msgid "Prepare conflict resolution"
-msgstr ""
+msgstr "Příprava řešení konfliktů"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216
@@ -8986,9 +9003,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:100
 msgid "Upload data to an already existing and open changeset"
-msgstr ""
+msgstr "Nahrát data k již existující otevřené sadě změn"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:111
 msgid "Select an open changeset"
-msgstr ""
+msgstr "Vyberte otevřenou sadu změn"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:145
@@ -9058,9 +9075,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237
 msgid "Please enter the user name of your OSM account"
-msgstr ""
+msgstr "Prosím, zadejte uživatelské jméno pro váš OSM účet"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238
 msgid "Please enter the password of your OSM account"
-msgstr ""
+msgstr "Prosím, zadejte heslo pro váš OSM účet"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240
@@ -9077,9 +9094,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254
 msgid "Please enter the user name for authenticating at your proxy server"
-msgstr ""
+msgstr "Prosím, zadejte uživatelské jméno pro přístup na proxy server"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255
 msgid "Please enter the password for authenticating at your proxy server"
-msgstr ""
+msgstr "Prosím, zadejte heslo pro přístup na proxy server"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257
@@ -9098,13 +9115,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279
 msgid "Authenticate"
-msgstr ""
+msgstr "Přihlásit"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280
 msgid "Authenticate with the supplied username and password"
-msgstr ""
+msgstr "Přihlásit se se zadaným jménem a heslem"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293
 msgid "Cancel authentication"
-msgstr ""
+msgstr "Zrušit přihlášení"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:63
@@ -9138,5 +9155,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 "Ne"
@@ -9144,6 +9161,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 "Vrstva ''{0}'' má změny, které by měly být nahrány na server."
 
@@ -9230,6 +9246,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] ""
@@ -9243,6 +9259,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 "
@@ -9430,5 +9446,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
 msgid "Configure advanced settings"
-msgstr ""
+msgstr "Konfigurovat pokročilé nastavení"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
@@ -9456,9 +9472,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
 msgid "Please enter a valid chunk size first"
-msgstr ""
+msgstr "Prosím, zadejte nejprve platnou velikost bloku"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
 msgid "Illegal chunk size"
-msgstr ""
+msgstr "Neplatná velikost bloku"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
@@ -9472,5 +9488,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9500,6 +9516,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 "Sada změn bude po nahrání na server <strong>uzavřena</strong>."
 
@@ -9511,5 +9526,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:59
 msgid "configure changeset"
-msgstr ""
+msgstr "konfigurovat sadu změn"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:81
@@ -9568,6 +9583,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 ""
 "Nahrávám <strong>{0} objektů</strong> do <strong>několika sad změn</strong> "
@@ -9616,6 +9631,7 @@
 msgid "There is {0} object left to upload."
 msgid_plural "There are {0} objects left to upload."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Zbývá nahrát {0} objekt."
+msgstr[1] "Zbývá nahrát {0} objekty."
+msgstr[2] "Zbývá nahrát {0} objektů."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:113
@@ -9623,15 +9639,15 @@
 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 ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:124
 msgid "Changeset is full"
-msgstr ""
+msgstr "Sada změn je plná"
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9649,5 +9665,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..."
@@ -9659,6 +9675,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 ""
 
@@ -9740,5 +9755,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351
 msgid "(1 request)"
-msgstr ""
+msgstr "(1 požadavek)"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:353
@@ -9747,5 +9762,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362
 msgid "(# requests unknown)"
-msgstr ""
+msgstr "(# požadavků neznámý)"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357
@@ -9760,5 +9775,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411
 msgid "Illegal chunk size <= 0. Please enter an integer > 1"
-msgstr ""
+msgstr "Neplatná velikost bloku <= 0. Prosím, zadejte celé číslo > 1"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413
@@ -9767,8 +9782,10 @@
 msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''"
 msgstr ""
+"Velikost bloku {0} překračuje maximální velikost sady změn {1} pro server "
+"''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415
 msgid "Please enter an integer > 1"
-msgstr ""
+msgstr "Prosím, zadejte celé číslo > 1"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422
@@ -9880,7 +9897,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 ""
 
@@ -9888,5 +9905,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
 msgid "Import not possible"
-msgstr ""
+msgstr "Import není možný"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255
@@ -9906,7 +9923,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 ""
 
@@ -9972,9 +9989,9 @@
 #: ../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:"
-msgstr ""
-"<html>Nahrání nezpracovaných GPS dat je považováno za poškozování "
-"projektu.<br>Pokud chcete nahrát trasy, podívejte se tady:"
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>Nahrání nezpracovaných GPS dat je považováno za poškozování projektu."
+"<br>Pokud chcete nahrát trasy, podívejte se tady:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
@@ -10018,17 +10035,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898
 msgid "Download near:"
-msgstr ""
+msgstr "Stáhnout poblíž:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
 msgid "track only"
-msgstr ""
+msgstr "pouze trasy"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
 msgid "waypoints only"
-msgstr ""
+msgstr "pouze značky"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
 msgid "track and waypoints"
-msgstr ""
+msgstr "trasy a značky"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
@@ -10075,6 +10092,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-"Varování: míchání dat z verze 0.6 a 0.5 má za výsledek data verze 0.5"
+msgstr "Varování: míchání dat z verze 0.6 a 0.5 má za výsledek data verze 0.5"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
@@ -10166,10 +10182,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
 msgid "Following problems found:"
-msgstr ""
+msgstr "Nalezeny následující problémy:"
 
 #: ../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 ""
 
@@ -10233,7 +10249,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 ""
 "<html>Vyfotografujte váš GPS přijímač když ukazuje čas.<br>Zobrazte zde jeho "
@@ -10309,5 +10325,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
 msgid "Manual adjust"
-msgstr ""
+msgstr "Ruční srovnání"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
@@ -10327,5 +10343,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
 msgid "Show Thumbnail images on the map"
-msgstr ""
+msgstr "Zobrazovat náhledy obrázků v mapě"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
@@ -10509,6 +10525,7 @@
 msgid "{0} image loaded."
 msgid_plural "{0} images loaded."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} obrázek nahrán."
+msgstr[1] "{0} obrázky nahrány."
+msgstr[2] "{0} obrázků nahráno."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
@@ -10522,5 +10539,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
-msgstr ""
+msgstr "Smazat obrázek z disku"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
@@ -10533,5 +10550,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
 msgid "Image file could not be deleted."
-msgstr ""
+msgstr "Soubor s obrázkem nebylo možné smazat."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
@@ -10624,4 +10641,6 @@
 "Direction {0}°"
 msgstr ""
+"\n"
+"Směr {0}°"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/JpegFileFilter.java:31
@@ -10788,9 +10807,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
 msgid "Click to reset the OAuth settings to default values"
-msgstr ""
+msgstr "Klikněte pro nastavení OAuth nastavení na výchozí hodnoty"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
 msgid "Click to abort resetting to the OAuth default values"
-msgstr ""
+msgstr "Klikněte pro zrušení nastavení OAuth na výchozí hodnoty"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
@@ -10802,5 +10821,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
 msgid "Overwrite custom OAuth settings?"
-msgstr ""
+msgstr "Přepsat vlastní OAuth nastavení?"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:58
@@ -10820,11 +10839,11 @@
 "<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 ""
 "<html>Spustí plně automatickou proceduru k získání přístupového tokenu z "
 "webu OSM.<br>JOSM vstoupí na web OSM pod uživatelským účtem zadaným do JOSM "
-"a <br>automaticky autorizuje uživatele pro kterého získá přístupový "
-"token.</html>"
+"a <br>automaticky autorizuje uživatele pro kterého získá přístupový token.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:80
@@ -10836,6 +10855,6 @@
 "submitted by JOSM.</html>"
 msgstr ""
-"<html>Spustí polo-automatickou proceduru k získání tokenu z webu "
-"OSM.<br>JOSM odešle standardní požadavek k získání OAuth tokenu.<br>Ten bude "
+"<html>Spustí polo-automatickou proceduru k získání tokenu z webu OSM."
+"<br>JOSM odešle standardní požadavek k získání OAuth tokenu.<br>Ten bude "
 "uživateli zobrazen v externím prohlížeči <br>aby se autorizoval a akceptoval "
 "vložení tokenu do JOSM.</html>"
@@ -10851,8 +10870,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 ""
 
@@ -10932,4 +10951,5 @@
 msgid "The user name cannot be empty. Please enter your OSM user name"
 msgstr ""
+"Uživatelské jméno nemůže být prázdné. Zadejte vaše uživatelské jméno pro OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:426
@@ -10940,5 +10960,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:428
 msgid "The password cannot be empty. Please enter your OSM password"
-msgstr ""
+msgstr "Heslo nemůže být prázdné. Zadejte vaše heslo pro OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:438
@@ -10954,6 +10974,6 @@
 "<html>Proces automatického získaní přístupového tokenu OAuth <br>z OSM "
 "serveru selhal.<br><br>Prosím opakujte pokus nebo zvolte jiný typ "
-"autorizačního procesu,<br> např polo-automatický nebo manuální "
-"autorizaci.</html>"
+"autorizačního procesu,<br> např polo-automatický nebo manuální autorizaci.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:458
@@ -10961,5 +10981,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:498
 msgid "OAuth authorization failed"
-msgstr ""
+msgstr "OAuth přihlášení selhalo"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:467
@@ -10976,6 +10996,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 ""
 
@@ -10989,5 +11009,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:97
 msgid "Save Access Token to preferences"
-msgstr ""
+msgstr "Uložit přístupový token do nastavení"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:118
@@ -10997,13 +11017,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:119
 msgid "Advanced OAuth parameters"
-msgstr ""
+msgstr "Pokročilé parametry OAuth"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:121
 msgid "Enter the OAuth Access Token"
-msgstr ""
+msgstr "Zadejte přístupový token OAuth"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:122
 msgid "Enter advanced OAuth properties"
-msgstr ""
+msgstr "Zadejte pokročilé vlasnosti OAuth"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:139
@@ -11036,5 +11056,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:438
 msgid "Click to test the Access Token"
-msgstr ""
+msgstr "Klikněte pro test přístupového tokenu"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:115
@@ -11056,9 +11076,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:344
 msgid "Close the dialog and cancel authorization"
-msgstr ""
+msgstr "Zavžit zialog a zrušit přihlášení"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:363
 msgid "Close the dialog and accept the Access Token"
-msgstr ""
+msgstr "Zavřít dialog a přijmout přístupový token"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101
@@ -11085,6 +11105,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 ""
 
@@ -11172,5 +11191,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
 msgid "Request Failed"
-msgstr ""
+msgstr "Požadavek selhal"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
@@ -11218,8 +11237,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 ""
 
@@ -11305,8 +11324,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 ""
 "<html>Přístupový token ''{1}'' známý OSM serveru ''{0}''.<br>Test získání "
@@ -11317,5 +11336,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
 msgid "Token allows restricted access"
-msgstr ""
+msgstr "Token umožňuje omezený přístup"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
@@ -11337,7 +11356,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 ""
 
@@ -11388,5 +11407,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 "Zvolte řádek k vymazání"
@@ -11743,6 +11762,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 "Zobrazovat směrové šipky pomocí tabulek místo komplexní matematiky."
 
@@ -11803,6 +11821,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 "Aplikovat vyhlazování (antialiasing) v mapě pro jemnější zobrazení."
 
@@ -11874,5 +11891,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 "Povolit vestavěné výchozí hodnoty"
@@ -11892,6 +11909,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>:"
@@ -11935,5 +11951,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:275
 msgid "Download the list of available plugins"
-msgstr ""
+msgstr "Stáhnout seznam dostupných pluginů"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:303
@@ -11953,5 +11969,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:315
 msgid "Please restart JOSM to activate the downloaded plugins."
-msgstr ""
+msgstr "Prosím, restartujte JOSM k aktivaci stažených pluginů."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:331
@@ -12023,6 +12039,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 ""
 "<p>Kromě toho jsou klávesové zkratky aktivovány při prvním použití položky "
@@ -12039,9 +12055,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 ""
 
@@ -12338,6 +12354,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 ""
 
@@ -12348,5 +12364,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 ""
@@ -12356,18 +12372,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 ""
@@ -12376,5 +12392,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 ""
@@ -12383,5 +12399,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 ""
@@ -12390,9 +12406,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 "Setřídit nabídku s přednastaveními"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
 msgid "Tagging Presets"
 msgstr "Přednastavení tagů"
@@ -12507,6 +12523,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 ""
 
@@ -12522,5 +12538,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131
 msgid "Connection to API failed"
-msgstr ""
+msgstr "Připojení k API selhalo"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
@@ -12528,6 +12544,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 ""
 
@@ -12613,6 +12629,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 ""
 
@@ -12630,11 +12645,10 @@
 
 #: ../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 "Již máte přístupový token pro přístup OSM serveru pomocí OAuth."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:258
 msgid "Save to preferences"
-msgstr ""
+msgstr "Uložit do nastavení"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:307
@@ -12659,6 +12673,5 @@
 #, java-format
 msgid "<html>Use the default OSM server URL (<strong>{0}</strong>)</html>"
-msgstr ""
-"<html>Použít standardní URL OSM serveru (<strong>{0}</strong>)</html>"
+msgstr "<html>Použít standardní URL OSM serveru (<strong>{0}</strong>)</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:88
@@ -12725,6 +12738,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 ""
 "Použít standardní systémové nastavení (zakázáno. Spusťte JOSM s "
@@ -12864,4 +12877,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 "Změnit vlastnosti"
@@ -12992,5 +13006,5 @@
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:134
 msgid "The proxy will not be used."
-msgstr ""
+msgstr "Proxy server nebude použit."
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:90
@@ -13029,5 +13043,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
@@ -13047,5 +13061,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}''"
@@ -13060,9 +13074,9 @@
 #, java-format
 msgid "Could not import ''{0}''."
-msgstr ""
+msgstr "Nepovedlo se importovat ''{0}''."
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:48
 msgid "Could not import files."
-msgstr ""
+msgstr "Nepovedlo se importovat soubory."
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:62
@@ -13212,6 +13226,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 ""
 
@@ -13331,10 +13344,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 "neočekávaný formát id získaný ze serveru, získáno ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:278
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -13343,69 +13356,69 @@
 "neočekávaný formát nové verze modifikovaného prvku ''{0}'', zadáno ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
 msgid "Creating changeset..."
 msgstr "Vytvářím sadu změn..."
 
-#: ../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 "Úspěšně otevřená sada změn {0}"
 
-#: ../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 "Sada změn s ID > 0 očekávána. Nalezeno {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349
 msgid "Updating changeset..."
 msgstr "Aktualizuji sadu změn..."
 
-#: ../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 "Aktualizuji sadu změn {0}..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:388
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389
 msgid "Closing changeset..."
 msgstr "Zavírám sadu změn..."
 
-#: ../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 "Není k dizpozici sada změn pro rozdílový upload"
 
-#: ../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
+msgstr "Připravuji požadavak na nahrání..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447
 msgid "Waiting 10 seconds ... "
 msgstr "Čekám 10 sekund ... "
 
-#: ../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 "Zkusím nový pokus, {0} z {1}, během {2} sekund ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:458
 msgid "OK - trying again."
 msgstr "OK - další pokus."
 
-#: ../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 "Zahajuji pokus {0} z {1}."
 
-#: ../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
+msgstr "Současná sada změn je plná. Nelze nahrávat data na server."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:637
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr "ID aktuální sady změn musí být větší než 0. Aktuální ID je {0}."
 
-#: ../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}."
@@ -13589,4 +13602,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})"
@@ -13606,6 +13620,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 ""
 "<html>Došlo k chybě při obnovování zálohy souboru.<br>Chyba: <br>{0}</html>"
@@ -13634,15 +13648,14 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
-msgstr ""
-"Chybějící povinné atributy prvku ''bounds''. Nalezeno "
-"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 ""
+"Chybějící povinné atributy prvku ''bounds''. Nalezeno minlon=''{0}'',"
+"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
 msgid "Found XML element <nd> not as direct child of element <way>."
-msgstr ""
-"Nalezen XML element <nd> jinde, než jako přímý potomek elementu <rway>"
+msgstr "Nalezen XML element <nd> jinde, než jako přímý potomek elementu <rway>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
@@ -13662,5 +13675,5 @@
 #, java-format
 msgid "Deleted way {0} contains nodes"
-msgstr ""
+msgstr "Smazaná cesta {0} obsahuje uzly"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
@@ -13680,8 +13693,6 @@
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
-msgid ""
-"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
-msgstr ""
-"Neplatná hodnota atributu ''ref'' na členu v relaci {0}. Nalezeno {1}"
+msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+msgstr "Neplatná hodnota atributu ''ref'' na členu v relaci {0}. Nalezeno {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
@@ -13708,9 +13719,9 @@
 #, java-format
 msgid "Deleted relation {0} contains members"
-msgstr ""
+msgstr "Smazaná relace {0} obsahuje členy"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
 msgid "Missing key or value attribute in tag."
-msgstr ""
+msgstr "V tagu chybí atribut \"key\" nebo \"value\"."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
@@ -13806,5 +13817,5 @@
 #, java-format
 msgid "Deleted node {0} is part of way {1}"
-msgstr ""
+msgstr "Smazaný uzel {0} je součástí cesty {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
@@ -13828,5 +13839,5 @@
 #, java-format
 msgid "Deleted member {0} is used by relation {1}"
-msgstr ""
+msgstr "Smazaný člen {0} je používán v relaci {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
@@ -14130,6 +14141,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 ""
 
@@ -14183,9 +14194,9 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:560
 msgid "Removing deprecated plugins..."
-msgstr ""
+msgstr "Odstraňuji zastaralé pluginy..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:562
 msgid "Removing unmaintained plugins..."
-msgstr ""
+msgstr "Odstraňuji neudržované pluginy..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:586
@@ -14208,5 +14219,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
 msgid "Plugin update failed"
-msgstr ""
+msgstr "Aktualizace pluginů selhala"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
@@ -14224,5 +14235,5 @@
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
-msgstr ""
+msgstr "Klikněte pro smazání pluginu ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713
@@ -14235,10 +14246,10 @@
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
-msgstr ""
+msgstr "Klikněte pro ponechání pluginu ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
-msgstr ""
+msgstr "Varování: nepodařilo se smazat zastaralý plugin ''{0}''."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:790
@@ -14260,5 +14271,5 @@
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
-msgstr ""
+msgstr "Klikněte pro zakázání pluginu ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820
@@ -14342,6 +14353,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 ""
 
@@ -14408,5 +14418,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"
@@ -14489,17 +14499,17 @@
 msgid ""
 "<html>Uploading to the server <strong>failed</strong> because your "
-"current<br>dataset violates a precondition.<br>The error message "
-"is:<br>{0}</html>"
+"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
+"html>"
 msgstr ""
 "<html>Aktualizace na server <strong>selhala</strong>, protože vaše "
-"aktuální<br>datová sada nesplňuje předpoklad.<br>Chybová zpráva "
-"je:<br>{0}</html>"
+"aktuální<br>datová sada nesplňuje předpoklad.<br>Chybová zpráva je:<br>{0}</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:113
 #, 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 ""
 
@@ -14507,7 +14517,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 ""
 
@@ -14515,8 +14525,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 ""
 
@@ -14536,7 +14546,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 ""
 
@@ -14615,7 +14625,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 ""
 "<html>OSM server<br>''{0}''<br>reportoval interní chybu serveru.<br>Jde s "
@@ -14629,7 +14638,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 ""
 
@@ -14664,6 +14673,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 ""
 
@@ -15093,5 +15102,5 @@
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:34
 msgid "Align Way Segments"
-msgstr ""
+msgstr "Srovnat úseky cest"
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:35
@@ -15103,5 +15112,5 @@
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:38
 msgid "Align Ways"
-msgstr ""
+msgstr "Srovnat cesty"
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
@@ -15126,5 +15135,5 @@
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
 msgid "I''m ready!"
-msgstr ""
+msgstr "Jsem připraven!"
 
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
@@ -15136,9 +15145,9 @@
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
 msgid "Align Ways mode"
-msgstr ""
+msgstr "Režim rovnání cest"
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:172
 msgid "Align way segment"
-msgstr ""
+msgstr "Srovnat úsek cesty"
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
@@ -15170,6 +15179,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>"
@@ -15196,6 +15205,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"
@@ -15233,6 +15242,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"
@@ -15248,7 +15257,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"
@@ -15273,5 +15282,5 @@
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
 msgid "Don''t show this again"
-msgstr ""
+msgstr "Toto již víckrát neukazovat"
 
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
@@ -15299,9 +15308,29 @@
 msgstr "Čísla:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:134
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#, fuzzy
+msgid "Big buildings mode"
+msgstr "Nastavit rozměry budov"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#, fuzzy
+msgid "Rotate crosshair"
+msgstr "Otočit vpravo"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#, fuzzy
+msgid "Advanced settings"
+msgstr "Konfigurovat pokročilé nastavení"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#, fuzzy
+msgid "Building tag:"
+msgstr "Budova"
+
+#: ../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"
@@ -15310,36 +15339,47 @@
 #: ../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 "Nastavit rozměry budov"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:24
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
 msgid "Use Address dialog"
 msgstr "Zadat  adresu budovy"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#, fuzzy
+msgid "Auto-select building"
+msgstr "Vytvořit budovu"
+
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
 msgid "Buildings width:"
 msgstr "Šířka budov:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Length step:"
 msgstr "Délka kroku:"
 
-#: ../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
+#, fuzzy
+msgid "Advanced..."
+msgstr "Rozšířené"
+
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:65
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 msgid "Draw buildings"
 msgstr "Kreslit budovy"
 
-#: ../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"
-msgstr ""
+#: ../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
+#, fuzzy
+msgid "Set width of the building"
+msgstr "Nastavit šířku budovy"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
@@ -15521,7 +15561,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--waterway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15531,5 +15571,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15539,5 +15579,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15553,5 +15593,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15561,5 +15601,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15567,8 +15607,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 "voda"
@@ -15590,5 +15630,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15597,5 +15637,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15604,5 +15644,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15611,5 +15651,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15618,5 +15658,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15625,10 +15665,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 "adresa"
@@ -15657,11 +15697,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 ""
 
@@ -15783,13 +15822,13 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256
 msgid "Parcels."
-msgstr ""
+msgstr "Parcely."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259
 msgid "Parcels numbers, street names."
-msgstr ""
+msgstr "Čísla parcel, jména ulic."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262
 msgid "Address, houses numbers."
-msgstr ""
+msgstr "adresy, čísla domů."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265
@@ -15799,9 +15838,9 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268
 msgid "Cadastral sections and subsections."
-msgstr ""
+msgstr "Sekce a podsekce katastru."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271
 msgid "Municipality administrative borders."
-msgstr ""
+msgstr "Administrativní hranice samospráv."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279
@@ -16048,6 +16087,6 @@
 "known by www.cadastre.gouv.fr .</html>"
 msgstr ""
-"<html>Vložte název města nebo obce.<br>Použijte syntax a interpunkci dle "
-"www.cadastre.gouv.fr .</html>"
+"<html>Vložte název města nebo obce.<br>Použijte syntax a interpunkci dle www."
+"cadastre.gouv.fr .</html>"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:74
@@ -16103,6 +16142,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 "Prázdná vrstva"
@@ -16290,4 +16329,52 @@
 msgstr "Nenalezena vrstva s GPX daty."
 
+#: ../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 "Upravit zoo"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#, fuzzy
+msgid "Name:"
+msgstr "Název"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#, fuzzy
+msgid "CmdLine:"
+msgstr "Souřadnice:"
+
+#: ../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
+#, fuzzy, java-format
+msgid "Delete tool \"{0}\"?"
+msgstr "Smazat bod {0}"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:74
+msgid "Are you sure?"
+msgstr "Jste si jist?"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
+#, fuzzy
+msgid "New tool..."
+msgstr "Nová role"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
+#, fuzzy
+msgid "Install"
+msgstr "Průmysl"
+
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
 msgid "Position only"
@@ -16557,5 +16644,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#. 
+#.
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16676,8 +16763,6 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
-msgstr ""
-"Maximální počet úseků v každé vygenerované cestě. Výchozí hodnota 250."
+msgid "Maximum number of segments allowed in each generated way. Default 250."
+msgstr "Maximální počet úseků v každé vygenerované cestě. Výchozí hodnota 250."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
@@ -16697,11 +16782,10 @@
 #: ../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 "
+"Accuracy of Douglas-Peucker line simplification, measured in degrees."
+"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
+msgstr ""
+"Přesnost Douglas-Peuckerova generalizace linie, hodnota ve stupních."
+"<br>Nižší hodnoty vracejí více uzlů s menším zjednodušením. Výchozí hodnota "
 "0.0003."
-msgstr ""
-"Přesnost Douglas-Peuckerova generalizace linie, hodnota ve "
-"stupních.<br>Nižší hodnoty vracejí více uzlů s menším zjednodušením. Výchozí "
-"hodnota 0.0003."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
@@ -16714,6 +16798,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
-msgstr ""
-"Velikost jedné dlaždice z Landsatu, v pixelech. Výchozí hodnota 2000."
+msgstr "Velikost jedné dlaždice z Landsatu, v pixelech. Výchozí hodnota 2000."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
@@ -17020,6 +17103,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 ""
 "Hlavička obsahuje několik hodnot a nelze ji mapovat do jednoduchého řetězce"
@@ -17134,6 +17216,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 ""
 
@@ -17179,5 +17260,5 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
 msgid "Read error!"
-msgstr ""
+msgstr "Chyba při čtení!"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
@@ -17186,6 +17267,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 ""
 
@@ -17200,13 +17280,13 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 msgid "change file modification time:"
-msgstr ""
+msgstr "změnit datum modifikace soubory:"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "to gps time"
-msgstr ""
+msgstr "na gps čas"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "to previous value (unchanged mtime)"
-msgstr ""
+msgstr "na předchozí hodnotu (nezměněný čas)"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
@@ -17259,9 +17339,9 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
 msgid "Test failed: Could not read mtime."
-msgstr ""
+msgstr "Test selhal: nelze přečíst čas modifikace."
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
 msgid "Test failed: Could not write mtime."
-msgstr ""
+msgstr "Test selhal: nelze zapsat čas modifikace."
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
@@ -17415,5 +17495,5 @@
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:422
 msgid "Overview"
-msgstr ""
+msgstr "Přehled"
 
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:426
@@ -17424,5 +17504,5 @@
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:87
 msgid "Stops"
-msgstr ""
+msgstr "Zastávky"
 
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:430
@@ -17437,10 +17517,10 @@
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:75
 msgid "Create Stops from a GPX file"
-msgstr ""
+msgstr "Vytvořit zastávky z GPX souboru"
 
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230
 #, java-format
 msgid "IOException \"{0}\" occurred"
-msgstr ""
+msgstr "Nastala IOException \"{0}\""
 
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:83
@@ -17532,13 +17612,13 @@
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
 msgid "Revert changeset fully"
-msgstr ""
+msgstr "Vrátit zpět celou sadu změn"
 
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert selection only"
-msgstr ""
+msgstr "Vrátit zpět pouze výběr"
 
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
 msgid "Revert selection and restore deleted objects"
-msgstr ""
+msgstr "Vrátit zpět výběr a obnovit smazané objekty"
 
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
@@ -17546,5 +17626,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 msgid "Revert changeset"
-msgstr ""
+msgstr "Vrátit zpět sadu změn"
 
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
@@ -17552,5 +17632,5 @@
 msgstr "Vrátit zpět"
 
-#: ../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}"
@@ -17577,5 +17657,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:50
 msgid "Reverting..."
-msgstr ""
+msgstr "Vracím zpět..."
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:58
@@ -17600,5 +17680,42 @@
 #, java-format
 msgid "Revert changeset #{0}"
-msgstr ""
+msgstr "Vrátit zpět sadu změn #{0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:78
+#, fuzzy
+msgid "Road Sign Plugin"
+msgstr "Načítám pluginy"
+
+#: ../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 "Nelze načíst zdroj přednastavených tagů: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
+#, fuzzy, java-format
+msgid "Error parsing tagging preset from ''{0}'':\n"
+msgstr "Stahuji seznam pluginů z ''{0}''"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:104
+#, fuzzy, java-format
+msgid "Sign {0}"
+msgstr "Výběr: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:111
+#, fuzzy, java-format
+msgid "Additional sign {0}"
+msgstr "Přidat relaci {0}"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -17705,4 +17822,15 @@
 msgstr "Zadejte jednotky váhy"
 
+#: ../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 "Zjednodušit cestu"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
+#, fuzzy
+msgid "Delete unnecessary nodes from an area."
+msgstr "Smazat nepotřebné uzly z cesty."
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
 msgid "Slippy Map"
@@ -17966,9 +18094,9 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
 msgid "create an associatedStreet relation"
-msgstr ""
+msgstr "vytvořit relaci associatedStreet"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:172
 msgid "delete outline way"
-msgstr ""
+msgstr "smazat vnější obrys"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:192
@@ -18089,9 +18217,9 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:90
 msgid "Create/Edit turn restriction..."
-msgstr ""
+msgstr "Vytvořit/editovat zákaz odbočení..."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:92
 msgid "Create or edit a turn restriction."
-msgstr ""
+msgstr "Vytvořit nebo editovat zákaz odbočení."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/AdvancedEditorPanel.java:42
@@ -18204,9 +18332,9 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:406
 msgid "Do you want to save anyway?"
-msgstr ""
+msgstr "Chcete přesto uložit?"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:409
 msgid "Yes, save anyway"
-msgstr ""
+msgstr "Ano, stejně uložit"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:411
@@ -18216,13 +18344,13 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:415
 msgid "No, resolve issues first"
-msgstr ""
+msgstr "Ne, nejprve vyřešit problémy"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:417
 msgid "Cancel saving and start resolving pending issues first"
-msgstr ""
+msgstr "Zrušit uložení a začít nejprve řešit nevyřešené problémy"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:425
 msgid "Pending errors and warnings"
-msgstr ""
+msgstr "Nevyřešené chyby a varování"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:484
@@ -18285,9 +18413,9 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:754
 msgid "Delete this turn restriction"
-msgstr ""
+msgstr "Smazat tento zákaz odbočení"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
 msgid "Select this turn restriction"
-msgstr ""
+msgstr "Vybrat tento zákaz odbočení"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:810
@@ -18326,5 +18454,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:245
 msgid "Delete from turn restriction"
-msgstr ""
+msgstr "Smazat z tohoto zákazu odbočení"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:354
@@ -18382,6 +18510,6 @@
 "applicable for."
 msgstr ""
-"Vyberte typy vozidel na které se dopravní omezení "
-"<strong>NE</strong>aplikuje."
+"Vyberte typy vozidel na které se dopravní omezení <strong>NE</"
+"strong>aplikuje."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:82
@@ -18506,9 +18634,9 @@
 #: ../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>."
-msgstr ""
-"Vývoj pluginu turn restriction sponzoroval <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 ""
+"Vývoj pluginu turn restriction sponzoroval <a href=\"http://www.skobbler.de"
+"\">skobbler GmbH</a>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:96
@@ -18595,8 +18723,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 ""
 
@@ -18650,8 +18778,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 ""
 
@@ -18732,14 +18860,14 @@
 #, java-format
 msgid "The required tag <tt>{0}={1}</tt> is missing."
-msgstr ""
+msgstr "Povinný tag <tt>{0}={1}</tt> chybí."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java:45
 msgid "Add missing tag"
-msgstr ""
+msgstr "Přidat chybějící tag"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java:46
 #, java-format
 msgid "Add the missing tag {0}={1}"
-msgstr ""
+msgstr "Přidat chybějící tag {0}={1}"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
@@ -18766,6 +18894,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 ""
 
@@ -18773,6 +18901,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 ""
 
@@ -18799,5 +18927,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
 msgid "Select if the data should be added into a new layer"
-msgstr ""
+msgstr "Vyberte, pokud se mají data přidat do nové vrstvy"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96
@@ -18824,15 +18952,15 @@
 #, java-format
 msgid "Will get {0}"
-msgstr ""
+msgstr "Dostanu {0}"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174
 #, java-format
 msgid "Looking for {0}"
-msgstr ""
+msgstr "Hledám {0}"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176
 #, java-format
 msgid "Found {0}"
-msgstr ""
+msgstr "Nalezeno {0}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
@@ -18896,6 +19024,5 @@
 "An OSM data validator that checks for common errors made by users and editor "
 "programs."
-msgstr ""
-"Kontrolor OSM dat, hledající běžné chyby udělané uživateli a programy."
+msgstr "Kontrolor OSM dat, hledající běžné chyby udělané uživateli a programy."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:101
@@ -19072,6 +19199,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:80
 msgid "This test checks that there are no nodes at the very same location."
-msgstr ""
-"Tento test kontroluje, jestli dva body nejsou na přesně stejné pozici."
+msgstr "Tento test kontroluje, jestli dva body nejsou na přesně stejné pozici."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146
@@ -19308,6 +19434,5 @@
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
-msgstr ""
-"Tento test kontroluje cesty na podobnost jmen, kdy může jít o překlep."
+msgstr "Tento test kontroluje cesty na podobnost jmen, kdy může jít o překlep."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153
@@ -19433,7 +19558,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 ""
 
@@ -19631,9 +19755,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 "oblast"
@@ -19674,6 +19798,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:38
 msgid "This test checks for untagged nodes that are not part of any way."
-msgstr ""
-"Tento test hledá neotagované uzly, které nejsou součástí žádné cesty."
+msgstr "Tento test hledá neotagované uzly, které nejsou součástí žádné cesty."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:60
@@ -19730,11 +19853,147 @@
 msgstr "{0}, ..."
 
-#: ../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
+#, fuzzy, java-format
+msgid "{0} {1}% of GPS track"
+msgstr "{0} se skládá z {1} trasy"
+
+#: ../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 "Importovat zvuk"
+
+#: ../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 "Odstranit"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
+#, fuzzy
+msgid "removes current video from layer"
+msgstr "Odebrat fotografii z vrstvy"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
+#, fuzzy
+msgid "play/pause"
+msgstr "Přehrát/Pauza"
+
+#: ../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 "pozadí"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
+#, fuzzy
+msgid "jumps n sec back"
+msgstr "Skok zpět."
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "forward"
+msgstr "Vpřed"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "jumps n sec forward"
+msgstr "Skok vpřed"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
+#, fuzzy
+msgid "faster"
+msgstr "Rychleji"
+
+#: ../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 "Pomaleji"
+
+#: ../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 "Umožní přidat ukazatele/body na současnou GPS polohu."
+
+#. 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
+#, fuzzy
+msgid "Jump length"
+msgstr "Skočit tam"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#, fuzzy
+msgid "Set the length of a jump"
+msgstr "Nastavit jazyk"
+
+#: ../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
+#, fuzzy
+msgid "Loop length"
+msgstr "Délka"
+
+#: ../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 "vrstvu"
+
+#: ../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 ""
 
@@ -19950,9 +20209,9 @@
 "Toto může vést ke špatným souřadnicím."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
 msgid "Automatic downloading"
 msgstr "Automatické stahování"
 
-#: ../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}''"
@@ -19961,19 +20220,19 @@
 "url ''{0}''"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:105
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
 msgid "(deactivated)"
 msgstr "(deaktivované)"
 
-#: ../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 "WMS vrstva ({0}), automatické stahování v přiblížení {1}"
 
-#: ../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 "WMS vrstva ({0}), stahování v přiblížení {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
 #, java-format
 msgid ""
@@ -19988,17 +20247,17 @@
 "znovu?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Yes, fetch images"
 msgstr "Ano, stahovat obrázky"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Invalid URL?"
 msgstr "Neplatné URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311
 msgid "Download visible tiles"
 msgstr "Nahrát viditelné dlaždice"
 
-#: ../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"
@@ -20006,96 +20265,96 @@
 "Požadovaná plocha je příliš velká. Přibližte pohled nebo změňte rozlišení."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329
 msgid "Change resolution"
 msgstr "Změnit rozlišení"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341
 msgid "Reload erroneous tiles"
 msgstr "Znovu nahrát chybné dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365
 msgid "Alpha channel"
 msgstr "Alfa kanál"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385
 msgid "Save WMS layer to file"
 msgstr "Uložit WMS vrstvu do souboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
 msgid "Save WMS layer"
 msgstr "Uložit WMS vrstvu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413
 msgid "Load WMS layer from file"
 msgstr "Nahrát WMS vrstvu ze souboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
 msgid "Load WMS layer"
 msgstr "Načíst vrstvu WMS"
 
-#: ../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 "Nepodporovaná verze WMS souboru; nalezeno {0}, očekáváno {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
 msgid "File Format Error"
 msgstr "Chyba formátu souboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449
 msgid "Error loading file"
 msgstr "Chyba při nahrávání souboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463
 msgid "Set WMS Bookmark"
 msgstr "Nastavit záložku WMS"
 
-#: ../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 "K nahrání dat ze souboru otevřete nejprve prázdnou WMS vrstvu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
 msgid "WMS Plugin Preferences"
 msgstr "Nastavení pluginu WMS Plugin"
 
-#: ../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 "Upravit seznam WMS serverů zobrazený v menu WMS pluginu"
 
-#: ../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 "Jméno v menu"
 
-#: ../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 "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "Menu Name (Default)"
 msgstr "Jméno v menu (výchozí)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "WMS URL (Default)"
 msgstr "WMS URL (výchozí)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:86
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
 msgid "Enter a menu name and WMS URL"
 msgstr "Zadejte jméno v menu a WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:111
 msgid "Copy Selected Default(s)"
 msgstr "Kopírovat zvolené výchozí hodnoty"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
 msgid "Please select at least one row to copy."
 msgstr "Vyberte alespoň jeden řádek pro kopírování"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
 msgid "Downloader:"
 msgstr "Stahovač:"
@@ -20112,4 +20371,9 @@
 msgid "% of north:"
 msgstr "% na sever:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186
+#, fuzzy
+msgid "Simultaneous connections"
+msgstr "Uzel: spojený"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -20121,7 +20385,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
@@ -20173,8 +20437,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 "les"
@@ -20191,7 +20455,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--boundary tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -20201,5 +20465,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -20242,5 +20506,5 @@
 #. color boundary
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -20250,5 +20514,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -20258,5 +20522,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -20266,15 +20530,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 "hranice"
@@ -20290,5 +20554,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -20297,7 +20561,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--route tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -20307,5 +20571,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -20315,5 +20579,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -20323,5 +20587,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -20331,5 +20595,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -20339,5 +20603,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -20347,5 +20611,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -20355,12 +20619,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 "cesta"
@@ -20379,5 +20643,5 @@
 #: build/specialmessages.java:23
 msgid "Abort file chooser dialog."
-msgstr ""
+msgstr "Zrušit dialog na vybrání souboru."
 
 #. Strings in JFileChooser
@@ -20627,6 +20891,6 @@
 "openstreetmap.org."
 msgstr ""
-"Tento plugin přímo nahrává GPS trasy z aktivní vrstvy JOSM na "
-"openstreetmap.org."
+"Tento plugin přímo nahrává GPS trasy z aktivní vrstvy JOSM na openstreetmap."
+"org."
 
 #. Plugin Duplicate-Way
@@ -20645,21 +20909,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 "Stahuje GPS body z Globalsat dg100 data loggeru přímo do JOSM."
 
 #. Plugin graphview
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:28
 msgid "Visualizes routing information as a routing graph."
 msgstr "Vizualizuje informace o směrování v podobě grafu."
 
 #. Plugin grid
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:30
 msgid "Provide a background layer that displays a map grid"
 msgstr "Poskytuje vrstvu na pozadí zobrazující mřížku mapy"
 
 #. 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 "
@@ -20669,5 +20932,5 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:34
 msgid "Helps vectorizing WMS images."
 msgstr ""
@@ -20676,5 +20939,5 @@
 
 #. 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."
@@ -20683,5 +20946,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 "
@@ -20694,15 +20957,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 "
@@ -20713,5 +20976,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 "
@@ -20724,15 +20987,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:48
 msgid "Displays an OpenLayers background image"
 msgstr "Zobrazuje na pozadí obrázek z OpenLayers"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:50
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importuje problémy z OpenStreetBugs."
 
 #. 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"
@@ -20741,5 +21004,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."
@@ -20748,5 +21011,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 "
@@ -20755,5 +21018,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 "
@@ -20764,10 +21027,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Ohromný JGoodies Plastic Look and Feel."
 
 #. 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."
@@ -20775,15 +21038,16 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "Let other applications send commands to JOSM."
 msgstr "Umožní jiné aplikace posílat příkazy do JOSM."
 
 #. Plugin reverter
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid "Plugin for reverting changesets"
-msgstr ""
-
+msgstr "Plugin pro vracení sad změn zpět (revert)"
+
+#. 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 "
@@ -20794,10 +21058,17 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:71
 msgid "Provides routing capabilities."
 msgstr "Poskytuje směrování"
 
+#. 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 "
@@ -20808,15 +21079,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:77
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Umožní přidat ukazatele/body na současnou GPS polohu."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:79
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Poskytuje dialog umožňující editovat tagy v tabulce."
 
 #. 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 "
@@ -20826,10 +21097,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:83
 msgid "Make terraced houses out of single blocks."
 msgstr "Vytváření řadových domků z jednotlivých bloků."
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:85
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -20838,5 +21109,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) "
@@ -20847,5 +21118,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:89
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20856,10 +21127,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:91
 msgid "Allows undeleting object from OSM database"
-msgstr ""
+msgstr "Umožňuje obnovování smazaných objektů z OSM databáze"
 
 #. 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 "
@@ -20870,5 +21141,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 "
@@ -20878,5 +21149,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:97
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20887,15 +21158,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:99
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Snadné stahovaní velmi dlouhých propojených cest"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:101
 msgid "Select a sequence of non-branching connected ways"
-msgstr ""
+msgstr "Vyberte sekvenci nevětvících se spojených cest"
 
 #. 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 "
@@ -20904,5 +21175,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:105
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21793,10 +22064,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 "kruhový objezd"
@@ -21933,8 +22204,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"/>
@@ -22144,5 +22415,5 @@
 #. color motorroad
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -22152,5 +22423,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -22169,5 +22440,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -22177,5 +22448,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -22194,5 +22465,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -22202,5 +22473,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -22219,5 +22490,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -22227,5 +22498,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -22240,5 +22511,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -22256,8 +22527,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 "obytná oblast"
@@ -22272,5 +22543,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -22279,5 +22550,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--public_transport tags -->
 #. <rule>
@@ -22287,10 +22558,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 "obslužná cesta"
@@ -22305,5 +22576,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -22312,5 +22583,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -22320,10 +22591,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 "konstrukce"
@@ -22364,26 +22635,26 @@
 #: build/trans_presets.java:464
 msgid "Tracktype"
-msgstr ""
+msgstr "Typ cesty"
 
 #. item "Ways/Track" combo "Tracktype"
 #: build/trans_presets.java:464
 msgid "grade1"
-msgstr ""
+msgstr "stupeň 1"
 
 #: build/trans_presets.java:464
 msgid "grade2"
-msgstr ""
+msgstr "stupeň 2"
 
 #: build/trans_presets.java:464
 msgid "grade3"
-msgstr ""
+msgstr "stupeň 3"
 
 #: build/trans_presets.java:464
 msgid "grade4"
-msgstr ""
+msgstr "stupeň 4"
 
 #: build/trans_presets.java:464
 msgid "grade5"
-msgstr ""
+msgstr "stupeň 5"
 
 #: build/trans_presets.java:466 build/trans_presets.java:489
@@ -22437,9 +22708,9 @@
 #: build/trans_presets.java:490
 msgid "excellent"
-msgstr ""
+msgstr "vynikající"
 
 #: build/trans_presets.java:490
 msgid "good"
-msgstr ""
+msgstr "dobrá"
 
 #: build/trans_presets.java:490 build/trans_presets.java:2052
@@ -22449,13 +22720,13 @@
 #: build/trans_presets.java:490
 msgid "bad"
-msgstr ""
+msgstr "špatná"
 
 #: build/trans_presets.java:490
 msgid "horrible"
-msgstr ""
+msgstr "příšerná"
 
 #: build/trans_presets.java:499
 msgid "Wheelchairs"
-msgstr ""
+msgstr "Vozíky pro invalidy"
 
 #: build/trans_presets.java:500
@@ -22506,5 +22777,5 @@
 #: build/trans_presets.java:542
 msgid "Pedestrians"
-msgstr ""
+msgstr "Chodci"
 
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
@@ -22708,6 +22979,5 @@
 #: build/trans_presets.java:658 build/trans_presets.java:673
 msgid "pegasus"
-msgstr ""
-"pegas (se semafory a tlačítkem pro chodce, cyklisty a jezdce na koni)"
+msgstr "pegas (se semafory a tlačítkem pro chodce, cyklisty a jezdce na koni)"
 
 #: build/trans_presets.java:658 build/trans_presets.java:673
@@ -23330,9 +23600,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 "mokřina"
@@ -23662,5 +23932,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -23670,5 +23940,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -23678,5 +23948,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -23686,5 +23956,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -23694,5 +23964,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -23702,5 +23972,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -23710,5 +23980,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -23719,5 +23989,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -23725,9 +23995,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 "železnice"
@@ -23768,5 +24038,5 @@
 #: build/trans_presets.java:1238
 msgid "16.7"
-msgstr ""
+msgstr "16.7"
 
 #. </optional>
@@ -24320,35 +24590,35 @@
 #: build/trans_presets.java:1352
 msgid "E10 (10% Ethanol mix)"
-msgstr ""
+msgstr "E10 (10% směs etanolu)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
 #: build/trans_presets.java:1353
 msgid "E85 (85% Ethanol mix)"
-msgstr ""
+msgstr "E85 (85% směs etanolu)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
 #: build/trans_presets.java:1354
 msgid "LPG (Liquefied petroleum gas)"
-msgstr ""
+msgstr "LPG (propan-butan)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
 #: build/trans_presets.java:1355
 msgid "CNG (Compressed Natural Gas)"
-msgstr ""
+msgstr "CNG (zemní plyn)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
 #: build/trans_presets.java:1356
 msgid "1/25 mix (mofa/moped)"
-msgstr ""
+msgstr "1/25 mix (motorka/moped)"
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
 #: build/trans_presets.java:1357
 msgid "1/50 mix (mofa/moped)"
-msgstr ""
+msgstr "1/50 mix (motorka/moped)"
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #: build/trans_presets.java:1358
 msgid "With kiosk"
-msgstr ""
+msgstr "S kioskem"
 
 #. item "Car/Fuel" check "With kiosk"
@@ -24424,9 +24694,9 @@
 #: build/trans_presets.java:1374
 msgid "Spaces for Women"
-msgstr ""
+msgstr "Místa pro ženy"
 
 #: build/trans_presets.java:1375
 msgid "Spaces for Parents"
-msgstr ""
+msgstr "Místa pro rodiče"
 
 #: build/trans_presets.java:1376
@@ -25137,5 +25407,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -25145,5 +25415,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -25153,5 +25423,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -25161,5 +25431,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -25523,7 +25793,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--sport tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -25533,5 +25803,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -25541,5 +25811,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -25549,5 +25819,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -25557,5 +25827,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -25565,5 +25835,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -25573,5 +25843,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -25581,5 +25851,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -25589,5 +25859,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -25597,5 +25867,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -25605,5 +25875,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -25613,5 +25883,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -25621,5 +25891,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -25629,5 +25899,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -25637,5 +25907,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -25645,5 +25915,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -25653,5 +25923,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -25661,5 +25931,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -25669,5 +25939,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -25677,5 +25947,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -25685,5 +25955,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -25693,5 +25963,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -25701,5 +25971,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -25709,5 +25979,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -25717,5 +25987,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -25725,5 +25995,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -25733,5 +26003,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -25741,5 +26011,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -25749,5 +26019,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -25757,5 +26027,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -25765,5 +26035,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -25773,5 +26043,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -25781,5 +26051,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -25789,5 +26059,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -25797,5 +26067,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -25805,5 +26075,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -25813,5 +26083,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -25821,5 +26091,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -25829,5 +26099,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -25837,5 +26107,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -25845,5 +26115,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -25853,5 +26123,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -25861,5 +26131,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -25869,5 +26139,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -25877,5 +26147,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -25885,5 +26155,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -25893,33 +26163,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 "sport"
@@ -27278,9 +27548,9 @@
 #: build/trans_presets.java:2392
 msgid "indoor"
-msgstr ""
+msgstr "vnitřní"
 
 #: build/trans_presets.java:2392
 msgid "outdoor"
-msgstr ""
+msgstr "venkovní"
 
 #: build/trans_presets.java:2392
@@ -27597,7 +27867,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--landuse tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -27607,5 +27877,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -27615,5 +27885,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -27623,5 +27893,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -27631,5 +27901,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -27639,5 +27909,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -27647,5 +27917,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -27655,5 +27925,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -27663,12 +27933,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 "zeleň"
@@ -28535,5 +28805,5 @@
 #: build/trans_presets.java:2956
 msgid "Edit Civil Boundary"
-msgstr ""
+msgstr "Upravit civilní hranici"
 
 #. item "Boundaries/Civil" text "Name"
@@ -28961,22 +29231,22 @@
 #: build/trans_presets.java:3212
 msgid "Boundary type"
-msgstr ""
+msgstr "Typ hranice"
 
 #. item "Relations/Boundary" combo "Boundary type"
 #: build/trans_presets.java:3212
 msgid "administrative"
-msgstr ""
+msgstr "administrativní"
 
 #: build/trans_presets.java:3212
 msgid "national"
-msgstr ""
+msgstr "národní"
 
 #: build/trans_presets.java:3212
 msgid "civil"
-msgstr ""
+msgstr "civilní"
 
 #: build/trans_presets.java:3212
 msgid "political"
-msgstr ""
+msgstr "politická"
 
 #: build/trans_presets.java:3213
@@ -29084,5 +29354,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -29098,5 +29368,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -29106,18 +29376,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 -->
@@ -29126,7 +29413,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- cycleway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -29136,5 +29423,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -29144,5 +29431,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -29152,5 +29439,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -29160,12 +29447,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 "bicykl"
@@ -29192,5 +29480,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -29206,5 +29494,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -29214,5 +29502,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -29221,13 +29509,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"/>
@@ -29238,11 +29534,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 "pěší"
@@ -29261,8 +29558,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 "metro"
@@ -29374,9 +29671,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
@@ -29384,5 +29681,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,
@@ -29392,8 +29689,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
@@ -29407,5 +29704,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#. 
+#.
 #: build/trans_style.java:72
 msgid "standard"
@@ -29413,5 +29710,5 @@
 
 #. mappaint style named "standard"
-#. 
+#.
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -29460,6 +29757,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>
@@ -29539,5 +29836,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -29547,16 +29844,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 "zastaralý"
@@ -29567,5 +29864,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -29574,5 +29871,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -29581,5 +29878,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -29595,5 +29892,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -29607,5 +29904,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -29614,5 +29911,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -29621,5 +29918,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -29628,5 +29925,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -29635,5 +29932,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -29642,5 +29939,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -29649,5 +29946,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxweight"/>
@@ -29656,5 +29953,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxheight"/>
@@ -29663,5 +29960,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -29670,5 +29967,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxlength"/>
@@ -29677,5 +29974,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -29684,5 +29981,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="minspeed"/>
@@ -29691,5 +29988,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxstay"/>
@@ -29698,5 +29995,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="toll"/>
@@ -29705,5 +30002,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="barrier"/>
@@ -29880,7 +30177,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- highway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -29894,5 +30191,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -29902,7 +30199,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- tracktype tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -29912,5 +30209,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -29920,5 +30217,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -29928,5 +30225,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -29936,10 +30233,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 "dálnice"
@@ -29950,5 +30247,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -29957,5 +30254,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -29965,5 +30262,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -29972,5 +30269,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -29979,5 +30276,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -29986,5 +30283,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -29993,5 +30290,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -30000,5 +30297,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -30007,5 +30304,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -30014,5 +30311,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -30021,5 +30318,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -30028,8 +30325,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 "služby"
@@ -30040,8 +30337,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 "brod"
@@ -30052,5 +30349,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -30059,8 +30356,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 ""
@@ -30071,9 +30368,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 ""
@@ -30084,9 +30381,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 "říční břeh"
@@ -30097,8 +30394,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 "potok"
@@ -30109,8 +30406,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 "dok"
@@ -30121,5 +30418,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -30128,5 +30425,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -30135,5 +30432,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -30143,5 +30440,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -30150,5 +30447,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -30157,5 +30454,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -30164,5 +30461,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -30172,5 +30469,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -30181,5 +30478,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -30189,7 +30486,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--man_made tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -30199,5 +30496,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -30207,5 +30504,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -30215,5 +30512,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -30224,5 +30521,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -30231,5 +30528,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -30239,5 +30536,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -30247,5 +30544,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -30255,5 +30552,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -30263,5 +30560,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -30271,5 +30568,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -30279,5 +30576,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -30287,5 +30584,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -30295,5 +30592,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -30303,18 +30600,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 ""
@@ -30324,9 +30621,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 ""
@@ -30337,7 +30634,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- railway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -30347,5 +30644,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -30354,5 +30651,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -30362,5 +30659,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -30369,5 +30666,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -30377,5 +30674,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -30385,10 +30682,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 ""
@@ -30399,5 +30696,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -30408,13 +30705,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 ""
@@ -30425,5 +30722,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -30433,5 +30730,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30444,5 +30741,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30450,7 +30747,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 ""
@@ -30461,5 +30758,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -30468,5 +30765,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -30475,5 +30772,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -30482,7 +30779,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aeroway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -30493,9 +30790,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 ""
@@ -30506,8 +30803,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 "terminál"
@@ -30518,5 +30815,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -30526,8 +30823,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 ""
@@ -30538,8 +30835,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 ""
@@ -30550,5 +30847,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -30557,5 +30854,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -30564,7 +30861,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aerialway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -30574,5 +30871,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -30582,5 +30879,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -30590,5 +30887,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -30598,5 +30895,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -30606,10 +30903,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 "lanovka"
@@ -30620,11 +30917,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 "lehká sjezdovka"
@@ -30635,9 +30932,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 "střední sjezdovka"
@@ -30648,9 +30945,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 "těžká sjezdovka"
@@ -30661,9 +30958,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 "sjezdovka pro experty"
@@ -30674,9 +30971,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 ""
@@ -30687,9 +30984,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 "sjezdovka pro začátečníky"
@@ -30700,7 +30997,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--power tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -30710,5 +31007,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -30717,5 +31014,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -30725,5 +31022,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -30733,5 +31030,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -30741,5 +31038,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -30749,5 +31046,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -30757,5 +31054,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -30765,5 +31062,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -30773,5 +31070,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -30781,5 +31078,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -30789,5 +31086,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -30797,5 +31094,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -30805,15 +31102,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 "energetika"
@@ -30823,9 +31120,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 "molo"
@@ -30836,8 +31133,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 "potrubí"
@@ -30847,7 +31144,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--leisure tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -30857,5 +31154,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -30865,5 +31162,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -30873,5 +31170,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -30881,5 +31178,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -30889,5 +31186,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -30897,5 +31194,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -30905,5 +31202,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -30913,5 +31210,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -30921,5 +31218,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -30929,5 +31226,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -30937,5 +31234,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -30945,5 +31242,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -30953,5 +31250,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -30961,5 +31258,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -30969,5 +31266,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -30977,17 +31274,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 "oddych (leisure)"
@@ -30997,9 +31294,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 "přísav"
@@ -31009,7 +31306,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--amenity tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -31019,5 +31316,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -31027,5 +31324,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -31035,5 +31332,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -31043,5 +31340,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -31051,5 +31348,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -31059,5 +31356,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -31067,5 +31364,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -31075,5 +31372,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -31083,5 +31380,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -31091,14 +31388,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 "občanská vybavenost"
@@ -31108,5 +31405,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -31116,5 +31413,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -31124,5 +31421,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -31132,5 +31429,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -31140,5 +31437,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -31148,5 +31445,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -31156,5 +31453,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -31164,5 +31461,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -31172,5 +31469,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -31180,5 +31477,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -31188,5 +31485,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -31196,14 +31493,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 ""
@@ -31213,5 +31510,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -31220,5 +31517,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -31228,5 +31525,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -31235,5 +31532,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -31243,5 +31540,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -31251,5 +31548,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -31259,5 +31556,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -31266,5 +31563,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -31274,5 +31571,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -31282,5 +31579,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -31290,5 +31587,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -31298,5 +31595,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -31305,5 +31602,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -31312,5 +31609,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -31319,5 +31616,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -31326,5 +31623,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -31333,5 +31630,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -31340,5 +31637,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -31347,5 +31644,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -31354,5 +31651,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -31361,5 +31658,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -31368,5 +31665,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -31375,5 +31672,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -31382,5 +31679,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -31389,5 +31686,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -31397,5 +31694,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -31405,5 +31702,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -31413,5 +31710,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -31421,5 +31718,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -31429,5 +31726,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -31437,5 +31734,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -31445,5 +31742,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -31453,5 +31750,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -31461,5 +31758,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -31470,5 +31767,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -31478,5 +31775,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -31486,5 +31783,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -31494,5 +31791,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -31502,5 +31799,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -31510,5 +31807,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -31518,5 +31815,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -31526,5 +31823,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -31534,5 +31831,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -31542,5 +31839,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -31550,5 +31847,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -31558,5 +31855,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -31566,5 +31863,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -31574,5 +31871,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -31582,5 +31879,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -31590,5 +31887,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"/>
@@ -31598,5 +31903,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -31606,5 +31911,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -31614,5 +31919,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -31622,5 +31927,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -31629,27 +31934,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 ""
@@ -31659,5 +31965,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -31667,5 +31973,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -31675,12 +31981,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 "menší vodní plochy"
@@ -31690,5 +31996,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -31698,5 +32004,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -31706,5 +32012,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -31714,5 +32020,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -31722,5 +32028,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -31730,5 +32036,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -31738,11 +32044,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 "zdravotnictví"
@@ -31752,7 +32058,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--shop tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -31762,5 +32068,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -31770,5 +32076,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -31778,5 +32084,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -31786,5 +32092,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -31794,5 +32100,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -31802,5 +32108,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -31810,5 +32116,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -31818,5 +32124,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -31826,5 +32132,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -31834,5 +32140,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -31842,5 +32148,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -31850,5 +32156,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -31858,5 +32164,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -31866,5 +32172,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -31874,5 +32180,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -31882,5 +32188,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -31890,5 +32196,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -31898,5 +32204,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -31906,5 +32212,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -31914,5 +32220,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -31922,5 +32228,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -31930,5 +32236,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -31938,5 +32244,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -31946,5 +32252,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -31954,5 +32260,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -31962,5 +32268,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -31970,5 +32276,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -31978,5 +32284,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -31986,5 +32292,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -31994,5 +32300,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -32002,5 +32308,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -32010,5 +32316,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -32018,5 +32324,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -32026,5 +32332,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -32034,5 +32340,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -32042,5 +32348,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -32050,5 +32356,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -32058,5 +32364,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -32066,5 +32372,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -32074,5 +32380,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -32082,5 +32388,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -32090,31 +32396,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 "obchod"
@@ -32124,7 +32430,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--tourism tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -32134,5 +32440,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -32142,5 +32448,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -32150,5 +32456,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -32158,5 +32464,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -32166,5 +32472,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -32174,5 +32480,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -32182,12 +32488,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 "hotel"
@@ -32197,5 +32503,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -32205,5 +32511,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -32213,5 +32519,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -32221,5 +32527,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -32229,5 +32535,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -32237,5 +32543,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -32246,5 +32552,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -32254,5 +32560,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- information tags -->
 #. <rule>
@@ -32262,5 +32568,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -32270,5 +32576,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -32277,5 +32583,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -32284,13 +32590,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 "turistika"
@@ -32300,7 +32606,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--historic tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -32310,5 +32616,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -32318,5 +32624,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -32326,5 +32632,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -32334,5 +32640,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -32342,5 +32648,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -32350,5 +32656,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -32358,5 +32664,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -32366,5 +32672,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -32374,13 +32680,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 "historické"
@@ -32390,8 +32696,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 "lom"
@@ -32402,8 +32708,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 "skládka"
@@ -32414,5 +32720,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -32422,8 +32728,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 "nádrže"
@@ -32434,8 +32740,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 "zemědělství"
@@ -32446,6 +32752,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
-#. 
+#.
+#.
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -32455,8 +32761,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 "obchody"
@@ -32467,8 +32773,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 "průmysl"
@@ -32479,8 +32785,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 "stará zátěž, městské ruiny (Brownfield)"
@@ -32491,8 +32797,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 "Zastavitelné území (Greenfield)"
@@ -32503,8 +32809,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 "železniční plochy"
@@ -32515,5 +32821,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -32523,7 +32829,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--military tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -32533,5 +32839,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -32541,5 +32847,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -32549,5 +32855,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -32557,11 +32863,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 "vojenský"
@@ -32572,8 +32878,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 "hřbitov"
@@ -32583,8 +32889,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 "vrchol"
@@ -32595,9 +32901,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 "ledovec"
@@ -32607,9 +32913,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 "sopka"
@@ -32619,5 +32925,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -32628,5 +32934,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -32636,5 +32942,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -32644,5 +32950,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -32652,5 +32958,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -32660,12 +32966,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 "přírodní"
@@ -32675,9 +32981,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 "křoví"
@@ -32687,9 +32993,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 "vřesoviště"
@@ -32699,9 +33005,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 "zalesněné území"
@@ -32711,9 +33017,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 "bahno"
@@ -32723,9 +33029,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 "pláž"
@@ -32736,5 +33042,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?
@@ -32760,5 +33066,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -32769,11 +33075,11 @@
 #. </rule>
 #. -->
-#. 
+#.
 #. <!--name tags -->
-#. 
+#.
 #. <!--preferences tags -->
-#. 
+#.
 #. <!--place tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -32783,5 +33089,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -32791,5 +33097,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -32799,5 +33105,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -32807,5 +33113,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -32815,5 +33121,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -32823,5 +33129,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -32831,5 +33137,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -32839,5 +33145,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -32847,5 +33153,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -32855,5 +33161,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -32863,5 +33169,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -32871,15 +33177,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 "místo"
@@ -32889,9 +33195,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 "tiger_data"
@@ -32982,5 +33288,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#. 
+#.
 #. Data type can be:
 #. node        - a node point
@@ -32988,28 +33294,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
@@ -33124,5 +33430,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#. 
+#.
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -33135,5 +33441,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>
@@ -33158,6 +33464,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#. 
-#. 
+#.
+#.
 #. only for Germany
 #: build/trans_wms.java:17
@@ -33166,6 +33472,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#. 
-#. 
+#.
+#.
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -33180,6 +33486,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
@@ -33193,6 +33499,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
@@ -33212,6 +33518,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#. 
-#. 
+#.
+#.
 #. only for Japan
 #: build/trans_wms.java:39
@@ -33235,6 +33541,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
@@ -33322,13 +33628,10 @@
 #~ msgstr "Číst GPX..."
 
-#, java-format
 #~ msgid "GPS start: {0}"
 #~ msgstr "Start GPS: {0}"
 
-#, java-format
 #~ msgid "current delta: {0}s"
 #~ msgstr "nynější odchylka: {0}s"
 
-#, java-format
 #~ msgid "GPS end: {0}"
 #~ msgstr "Konec GPS: {0}"
@@ -33343,9 +33646,7 @@
 #~ msgstr "Synchronizovat hodiny"
 
-#, java-format
 #~ msgid "The date in file \"{0}\" could not be parsed."
 #~ msgstr "Data v souboru \"{0}\" nemohla být parsována."
 
-#, java-format
 #~ msgid "There is no EXIF time within the file \"{0}\"."
 #~ msgstr "V souboru \"{0}\" není časová značka EXIF"
@@ -33357,5 +33658,4 @@
 #~ msgstr "Zadejte datum ve tvaru (mm/dd/rrrr HH:MM:SS)"
 
-#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Chyba při načítání stránky {0}"
@@ -33373,5 +33673,4 @@
 #~ msgstr "Chyba parsování odezvy serveru"
 
-#, java-format
 #~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
 #~ msgstr "Nelze přečíst čas \"{0}\" z bodu {1} x {2}"
@@ -33380,9 +33679,7 @@
 #~ msgstr "Stáhnout plochu"
 
-#, java-format
 #~ msgid "No time for point {0} x {1}"
 #~ msgstr "Žádný čas pro bod {0} x {1}"
 
-#, java-format
 #~ msgid "Images for {0}"
 #~ msgstr "Obrázky pro {0}"
@@ -33395,6 +33692,6 @@
 
 #~ 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 ""
 #~ "Aktivace aktualizovaných pluginů selhala. Zkontrolujte, zda máte práva k "
@@ -33417,6 +33714,6 @@
 
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want to "
-#~ "combine them?"
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
 #~ msgstr "Vybrané cesty patří do jiné relace. Opravdu je chcete spojit?"
 
@@ -33439,7 +33736,4 @@
 #~ msgstr "Prosím, zadejte hledaný řetězec"
 
-#~ msgid "Are you sure?"
-#~ msgstr "Jste si jist?"
-
 #~ msgid "Resolve Conflicts"
 #~ msgstr "Vyřešit konflikty"
@@ -33469,5 +33763,4 @@
 #~ msgstr "Nahrát výběr"
 
-#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "Kontakt {0}..."
@@ -33485,5 +33778,6 @@
 #~ "Login password to the OSM account. Leave blank to not store any password."
 #~ msgstr ""
-#~ "Přihlašovací heslo k OSM účtu. Nechte prázdné, pokud nechcete heslo ukládat."
+#~ "Přihlašovací heslo k OSM účtu. Nechte prázdné, pokud nechcete heslo "
+#~ "ukládat."
 
 #~ msgid "Found <nd> element in non-way."
@@ -33509,12 +33803,13 @@
 
 #~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this as "
-#~ "a bug."
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
 #~ msgstr ""
-#~ "Interní chyba: nemohu ověřit podmínky pro žádné vrstvy. Reportuje jako chybu."
+#~ "Interní chyba: nemohu ověřit podmínky pro žádné vrstvy. Reportuje jako "
+#~ "chybu."
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version selected "
-#~ "in the history list."
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
 #~ msgstr ""
 #~ "Vrátit stav všech vybraných objektů na verzi vybranou ze seznamu historie."
@@ -33524,13 +33819,12 @@
 
 #~ msgid ""
-#~ "You are about to delete nodes outside of the area you have "
-#~ "downloaded.<br>This can cause problems because other objects (that you don't "
-#~ "see) might use them.<br>Do you really want to delete?"
+#~ "You are about to delete nodes outside of the area you have downloaded."
+#~ "<br>This can cause problems because other objects (that you don't see) "
+#~ "might use them.<br>Do you really want to delete?"
 #~ msgstr ""
 #~ "Chystáte se smazat uzly mimo oblast, jež jste stáhli.<br>To může způsobit "
-#~ "problémy, protože jiné objekty (které nevidíte) je mohou "
-#~ "používat.<br>Opravdu je chcete smazat?"
-
-#, java-format
+#~ "problémy, protože jiné objekty (které nevidíte) je mohou používat."
+#~ "<br>Opravdu je chcete smazat?"
+
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -33561,6 +33855,6 @@
 #~ "some time."
 #~ msgstr ""
-#~ "Server vrátil vnitřní chybu. Zkuste to za chvíli znovu nebo zkuste zmenšit "
-#~ "oblast."
+#~ "Server vrátil vnitřní chybu. Zkuste to za chvíli znovu nebo zkuste "
+#~ "zmenšit oblast."
 
 #~ msgid "Preparing..."
@@ -33570,9 +33864,7 @@
 #~ msgstr "Přenos přerušen kvůli chybě (čekám 5 sekund):"
 
-#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "Následující plugin vyžaduje aktulizaci JOSM: {0}."
 
-#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Následující plugin nenalezen:{0}."
@@ -33584,5 +33876,4 @@
 #~ msgstr "Stáhnout chybějící pluginy"
 
-#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -33597,5 +33888,4 @@
 #~ msgstr "Aktualizuj pluginy"
 
-#, java-format
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Nemohu stáhnout plugin: {0} z {1}"
@@ -33610,5 +33900,4 @@
 #~ msgstr "Upravit vlastnosti"
 
-#, java-format
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
 #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
@@ -33636,8 +33925,9 @@
 
 #~ 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 ""
-#~ "Zkuste aktualizovat na nejnovější verzi tohoto pluginu před hlášením chyby."
+#~ "Zkuste aktualizovat na nejnovější verzi tohoto pluginu před hlášením "
+#~ "chyby."
 
 #~ msgid "NullPointerException, possibly some missing tags."
@@ -33647,19 +33937,16 @@
 #~ msgstr "Nalezen <member> tag mimo relaci."
 
-#, java-format
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "Nemohu číst z URL:\"{0}\""
 
-#, java-format
 #~ msgid "Parsing error in URL: \"{0}\""
 #~ msgstr "Chyba parsování v URL:\"{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 ""
 #~ "Plugin {0} se zdá být poškozen nebo jej není možné automaticky stáhnout."
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -33682,8 +33969,7 @@
 #~ "about the problem."
 #~ msgstr ""
-#~ "Plugin nebylo možné odstranit. Prosíme informujte o tomto problému vývojáře "
-#~ "JOSM."
-
-#, java-format
+#~ "Plugin nebylo možné odstranit. Prosíme informujte o tomto problému "
+#~ "vývojáře JOSM."
+
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Prosíme oznamte chybu na {0}"
@@ -33695,25 +33981,19 @@
 #~ msgstr "Popište (detailně) kroky, které vedly k chybě."
 
-#, java-format
 #~ msgid "Way ''{0}'' with less than two points."
 #~ msgstr "Cesta ''{0}'' s méně, než dvěmi body."
 
-#, java-format
 #~ msgid "Style for outer way ''{0}'' mismatches."
 #~ msgstr "Styl pro vnější cestu ''{0}'' nesedí."
 
-#, java-format
 #~ msgid "Error: {0}"
 #~ msgstr "Chyba: {0}"
 
-#, java-format
 #~ msgid "Intersection between ways ''{0}'' and ''{1}''."
 #~ msgstr "Cesty ''{0}'' a ''{1}'' se protínají."
 
-#, java-format
 #~ msgid "Inner way ''{0}'' is outside."
 #~ msgstr "Vnitřní cesta ''{0}'' je venku."
 
-#, java-format
 #~ msgid "Warning: {0}"
 #~ msgstr "Varování: {0}"
@@ -33722,5 +34002,4 @@
 #~ msgstr "Povoleny pouze dva uzly"
 
-#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Nelze otevřít adresář s nastavením: {0}"
@@ -33757,9 +34036,7 @@
 #~ msgstr "Chyba během parsování"
 
-#, java-format
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "Použít přednastavení \"{0}\" ze skupiny \"{1}\""
 
-#, java-format
 #~ msgid "Use preset ''{0}''"
 #~ msgstr "Použít přednastavení \"{0}\""
@@ -33777,5 +34054,4 @@
 #~ msgstr "Nalezeno více cílových \"to\" cest."
 
-#, java-format
 #~ msgid "Style for restriction {0} not found."
 #~ msgstr "Styl pro omezení {0} nenalezen."
@@ -33787,5 +34063,4 @@
 #~ msgstr "Nenalezena odchozí cesta \"to\"."
 
-#, java-format
 #~ msgid "Unknown role ''{0}''."
 #~ msgstr "Neznámá role ''{0}''."
@@ -33794,17 +34069,13 @@
 #~ msgstr "Nalezena více než jedna \"from\" cesta."
 
-#, java-format
 #~ msgid "multipolygon way ''{0}'' is not closed."
 #~ msgstr "Cesta v multipolygonu ''{0}'' není uzavřena."
 
-#, java-format
 #~ msgid "Layers: {0}"
 #~ msgstr "Vrstvy: {0}"
 
-#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Zásobník příkazů: {0}"
 
-#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "Autoři: {0}"
@@ -33822,8 +34093,9 @@
 #~ msgstr "Vyberte řádek ke zkopírování."
 
-#, java-format
-#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
+#~ msgid ""
+#~ "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them all?"
+#~ "The selection contains {0} ways. Are you sure you want to simplify them "
+#~ "all?"
 #~ msgstr[0] "Výběr obsahuje {0} cestu. Opravdu ji chcete zjednodušit?"
 #~ msgstr[1] "Výběr obsahuje {0} cesty. Opravdu je chcete všechny zjednodušit?"
@@ -33842,9 +34114,7 @@
 #~ msgstr "Padací most"
 
-#, java-format
 #~ msgid "No outer way for multipolygon ''{0}''."
 #~ msgstr "Multipolygon ''{0}'' nemá žádnou vnější cestu."
 
-#, java-format
 #~ msgid "Non-Way ''{0}'' in multipolygon."
 #~ msgstr "Ne-cesta ''{0}'' v multipolygonu."
@@ -33871,5 +34141,4 @@
 #~ msgstr "Synchronizace času s GPS přijímačem"
 
-#, java-format
 #~ msgid "Unknown member type for ''{0}''."
 #~ msgstr "Neznámý typ prvku pro ''{0}''."
@@ -33879,6 +34148,6 @@
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still want "
-#~ "to merge them?"
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
 #~ msgstr ""
 #~ "Zvolené uzly mají rozdílné členství v relaci. Chcete je přesto spojit ?"
@@ -33896,8 +34165,9 @@
 #~ msgstr "Nastavit Lambertovu zónu ručně (např. pro místo mezi dvěmi zónami)"
 
-#, java-format
-#~ msgid "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
+#~ msgid ""
+#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
 #~ msgstr ""
-#~ "Lambertova zóna {0} v cache nekompatibilní se současnou Lambertovou zónou {1}"
+#~ "Lambertova zóna {0} v cache nekompatibilní se současnou Lambertovou zónou "
+#~ "{1}"
 
 #~ msgid ""
@@ -33915,6 +34185,6 @@
 #~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
 #~ msgstr ""
-#~ "TOTO JE EXPERIMENTÁLNÍ. Uložte svoji práci a ověřte výsledek před nahráním "
-#~ "na server."
+#~ "TOTO JE EXPERIMENTÁLNÍ. Uložte svoji práci a ověřte výsledek před "
+#~ "nahráním na server."
 
 #~ msgid "GPS unit timezone (difference to photo)"
@@ -33945,5 +34215,4 @@
 #~ msgstr "Sportovní potřeby"
 
-#, java-format
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr "Přeskakuji cestu, protože obsahuje neexistující uzel: {0}\n"
@@ -34003,5 +34272,4 @@
 #~ msgstr "Posunout nahoru"
 
-#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Editor relací: {0}"
@@ -34020,5 +34288,4 @@
 #~ "server mají historii."
 
-#, java-format
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
@@ -34030,5 +34297,4 @@
 #~ msgstr "Aktualizovat data"
 
-#, java-format
 #~ msgid "Change the projection to {0} first."
 #~ msgstr "Nejprve změňte projekci na {0}."
@@ -34043,5 +34309,4 @@
 #~ msgstr "Výchozí hodnoty"
 
-#, java-format
 #~ msgid "Offset between track and photos: {0}m {1}s"
 #~ msgstr "Posun mezi trasou a fotografiemi: {0}m {1}s"
@@ -34060,5 +34325,6 @@
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you load\n"
+#~ "Parameters are read in the order they are specified, so make sure you "
+#~ "load\n"
 #~ "some data before --selection"
 #~ msgstr ""
@@ -34100,5 +34366,6 @@
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data layer?"
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
 #~ msgstr ""
 #~ "Nenalezena aktuální data. Opravdu máte otevřenou nebo staženou datovou "
@@ -34108,5 +34375,4 @@
 #~ msgstr "Nelze načíst projekci z uloženého nastavení. Používám EPSG:4326"
 
-#, java-format
 #~ msgid "No useful role ''{0}'' for Way ''{1}''."
 #~ msgstr "Žádná použitelná role ''{0}'' pro cestu ''{1}''."
@@ -34143,6 +34409,6 @@
 #~ "move mouse.   Select: Click."
 #~ msgstr ""
-#~ "Zoom: pomocí kolečka myši nebo dvojkliku. Posun mapy: stiskni pravé tlačítko "
-#~ "a pohybuj myší. Vybrat: Kliknutí."
+#~ "Zoom: pomocí kolečka myši nebo dvojkliku. Posun mapy: stiskni pravé "
+#~ "tlačítko a pohybuj myší. Vybrat: Kliknutí."
 
 #~ msgid "Add either site-josm.xml or Wiki Pages."
@@ -34153,6 +34419,6 @@
 
 #~ msgid ""
-#~ "Tools to work with authors/users. Selects map data that belongs to selected "
-#~ "user, opens browser showing selected author profile page."
+#~ "Tools to work with authors/users. Selects map data that belongs to "
+#~ "selected user, opens browser showing selected author profile page."
 #~ msgstr ""
 #~ "Nástroje pro správu autorů/uživatelů. Vybere mapová data, která patří "
@@ -34160,6 +34426,6 @@
 
 #~ msgid ""
-#~ "Several utilities that make your life easier: e.g. simplify way, join areas, "
-#~ "jump to position."
+#~ "Several utilities that make your life easier: e.g. simplify way, join "
+#~ "areas, jump to position."
 #~ msgstr ""
 #~ "Několik nástrojů pro jednodužší život: např. zjednodušení cest, spojení "
@@ -34171,6 +34437,6 @@
 #~ msgid ""
 #~ "The main feature of the plugin is the possibility to delete points of the "
-#~ "GPX track. This plugin can be used to prepare  tracks for uploading to OSM "
-#~ "eg. deleting uninteresting parts of track."
+#~ "GPX track. This plugin can be used to prepare  tracks for uploading to "
+#~ "OSM eg. deleting uninteresting parts of track."
 #~ msgstr ""
 #~ "Hlavní předností tohoto pluginu je možnost smazat body z GPX trasy. Tento "
@@ -34184,5 +34450,4 @@
 #~ "'pluginmanager.warntime'.)"
 
-#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -34200,11 +34465,10 @@
 
 #~ msgid ""
-#~ "An error occured while trying to match the photos to the GPX track. You can "
-#~ "adjust the sliders to manually match the photos."
+#~ "An error occured while trying to match the photos to the GPX track. You "
+#~ "can adjust the sliders to manually match the photos."
 #~ msgstr ""
 #~ "Chyba nastala při pokusu o dosazení fotografií do GPX trasy. Můžete ručně "
 #~ "upravit posuvníky aby byli fotografie dosazeny."
 
-#, java-format
 #~ msgid "Found {0} matches of {1} in GPX track {2}"
 #~ msgstr "Nalezeno {0} shod s {1} v GPX trase {2}"
@@ -34213,5 +34477,4 @@
 #~ msgstr "Stáhne zaměřený obrázek z WMS zaměřovače na stránkách Metacarta"
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -34243,5 +34506,4 @@
 #~ "kartografické projekce.."
 
-#, java-format
 #~ msgid "Image with path {0} does not exist or is not readable."
 #~ msgstr "Obrázek s umístěný v {0} neexistuje nebo není čitelný."
@@ -34271,9 +34533,7 @@
 #~ msgstr "Chybný počet parametrů pro operátor nodes."
 
-#, java-format
 #~ msgid "Incorrect value of id operator: {0}. Number is expected."
 #~ msgstr "Neplatná hodnota pro operátor id: {0}. Je očekáváno číslo."
 
-#, java-format
 #~ msgid ""
 #~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
@@ -34286,5 +34546,4 @@
 #~ msgstr "Selhala inicializace API, prosím zkuste to znovu později."
 
-#, java-format
 #~ msgid ""
 #~ "WARNING: launching browser windows for the first {0} of {1} selected "
@@ -34294,11 +34553,10 @@
 #~ "primitiv."
 
-#, java-format
 #~ msgid ""
 #~ "Current number of changes exceeds the max. number of changes, current is "
 #~ "{0}, max is {1}"
 #~ msgstr ""
-#~ "Počet změn překračuje maximální počet změn. Počet změn je {0} a maximum je "
-#~ "{1}"
+#~ "Počet změn překračuje maximální počet změn. Počet změn je {0} a maximum "
+#~ "je {1}"
 
 #~ msgid "No data"
@@ -34329,5 +34587,4 @@
 #~ msgstr "Aplikovat částečná řešení"
 
-#, java-format
 #~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
 #~ msgstr "<html>Selhalo nahrávání historie ze serveru. Detaily:<br>{0}</html>"
@@ -34345,9 +34602,7 @@
 #~ msgstr "Pridat do seznamu nový XML zdroj."
 
-#, java-format
 #~ msgid "The XML source (URL or filename) for {0} definition files."
 #~ msgstr "XML zdroj (URL nebo název souboru) pro {0} definiční soubory."
 
-#, java-format
 #~ msgid "Plugin {0} requires JOSM update to version {1}."
 #~ msgstr "Plugin {0} požaduje aktualizaci JOSM na verzi {1}."
@@ -34357,6 +34612,6 @@
 
 #~ msgid ""
-#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
-#~ "these will then show up in the WMS menu.\n"
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
 #~ "\n"
 #~ "You can also do this manually in the Advanced Preferences, using the "
@@ -34372,6 +34627,6 @@
 #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
 #~ "only need to input the relevant 'id'.\n"
-#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in "
-#~ "this example, replacing 73 with your image id:\n"
+#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
+#~ "in this example, replacing 73 with your image id:\n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -34380,6 +34635,6 @@
 #~ "use."
 #~ msgstr ""
-#~ "Přidávat upravovat a mazat položky WMS pluginu můžete na záložce nastavení - "
-#~ "položky se následně zobrazí v menu WMS.\n"
+#~ "Přidávat upravovat a mazat položky WMS pluginu můžete na záložce "
+#~ "nastavení - položky se následně zobrazí v menu WMS.\n"
 #~ "\n"
 #~ "Totéž můžete také udělat v pokročilých volbách za použití následujícího "
@@ -34395,20 +34650,18 @@
 #~ "Pro Metacarta§s Map Rectifier http://labs.metacarta.com/rectifier/ , "
 #~ "potřebujete zadat pouze odpovídající 'id'.\n"
-#~ "Pro přidání položky Metacarta Map Rectifier do menu vyvořte ručně URL jako v "
-#~ "příkladu a 73 nahraďte id vašeho obrázku:\n"
+#~ "Pro přidání položky Metacarta Map Rectifier do menu vyvořte ručně URL "
+#~ "jako v příkladu a 73 nahraďte id vašeho obrázku:\n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
 #~ "\n"
-#~ "Poznámka: Ujistěte se, že obrázek vyhovuje copyrightu (je volně šiřitelný), "
-#~ "pokud si nejste jisti, nepoužívejte jej."
+#~ "Poznámka: Ujistěte se, že obrázek vyhovuje copyrightu (je volně "
+#~ "šiřitelný), pokud si nejste jisti, nepoužívejte jej."
 
 #~ msgid "aqueduct"
 #~ msgstr "akvadukt"
 
-#, java-format
 #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 #~ msgstr "Chybná hlavička \"{0}\" neodpovídá očekávanému vzoru \"{1}\""
 
-#, java-format
 #~ msgid ""
 #~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
@@ -34416,21 +34669,21 @@
 #~ "is:<br>{0}</html>"
 #~ msgstr ""
-#~ "<html>Aktualizace <strong>selhala</strong>, protože prvek který mažete<br>je "
-#~ "již na serveru vymazán.<br><br>Chybová zpráva je:<br>{0}</html>"
-
-#, java-format
+#~ "<html>Aktualizace <strong>selhala</strong>, protože prvek který "
+#~ "mažete<br>je již na serveru vymazán.<br><br>Chybová zpráva je:<br>{0}</"
+#~ "html>"
+
 #~ msgid ""
 #~ "<html>There are {0} primitives in your local dataset which<br>might be "
 #~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
-#~ "to check the state of these primitives<br>on the server.<br>Click "
+#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
+#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
 #~ "<strong>{2}</strong> to ignore.<br></html>"
 #~ msgstr ""
 #~ "<html>Ve vaší lokální datové sadě je {0} prvků, které<br>mohou být na "
 #~ "serveru smazány. Pokud se pokusíte pozdějí o jejich smazání "
-#~ "nebo<br>aktualizaci, server bude pravděpodobně "
-#~ "reportovat<br>konflikt.<br><br>Klikněte <strong>{1}</strong> pro zjištění "
-#~ "stavu těchto prvků<br>na serveru.<br>Klikněte <strong>{2}</strong> pro "
-#~ "ignorování.<br></html>"
+#~ "nebo<br>aktualizaci, server bude pravděpodobně reportovat<br>konflikt."
+#~ "<br><br>Klikněte <strong>{1}</strong> pro zjištění stavu těchto "
+#~ "prvků<br>na serveru.<br>Klikněte <strong>{2}</strong> pro ignorování."
+#~ "<br></html>"
 
 #~ msgid ">"
@@ -34440,15 +34693,13 @@
 #~ msgstr "V OSM datech chybí číslo verze"
 
-#, java-format
 #~ msgid "An error occurred while saving. Error is: {0}"
 #~ msgstr "Došlo k chybě při ukládání. Chyba: {0}"
 
-#, java-format
 #~ msgid "Unknown file extension for file ''{0}''"
 #~ msgstr "Neznámá přípona souboru ''{0}''"
 
 #~ msgid ""
-#~ "Enable to upload all changes in one request, disable to use one request per "
-#~ "changed primitive"
+#~ "Enable to upload all changes in one request, disable to use one request "
+#~ "per changed primitive"
 #~ msgstr ""
 #~ "Povoleno nahrává všechny změny najednou, zakázáno nahrává změnu každého "
@@ -34458,5 +34709,4 @@
 #~ msgstr "Nelze hledat jelikož nejsou nahrána žádná data."
 
-#, java-format
 #~ msgid ""
 #~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
@@ -34470,16 +34720,14 @@
 #~ msgstr "Potvrzení"
 
-#, java-format
 #~ msgid "Deleting layer {0} of {1}"
 #~ msgstr "Mazání vrstvy {0} z {1}"
 
-#, java-format
 #~ msgid ""
-#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal to "
-#~ "deleting the roles of these primitives.<br>Do you really want to apply the "
-#~ "new role?</html>"
+#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
+#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
+#~ "the new role?</html>"
 #~ msgstr ""
-#~ "<html>Nastavil jste prázdnou roli pro {0} prvků.<br>To je totéž jako smazání "
-#~ "role těchto prvků.<br>Opravdu chcete novou roli aplikovat?</html>"
+#~ "<html>Nastavil jste prázdnou roli pro {0} prvků.<br>To je totéž jako "
+#~ "smazání role těchto prvků.<br>Opravdu chcete novou roli aplikovat?</html>"
 
 #~ msgid "<multiple>"
@@ -34489,5 +34737,4 @@
 #~ msgstr "Spojený"
 
-#, java-format
 #~ msgid "Plug-in named {0} is not available. Update skipped."
 #~ msgstr "Plug-in {0} je nedostupný. Aktualizace přeskočena."
@@ -34505,17 +34752,13 @@
 #~ msgstr "Gauss-Laborde Réunion 1947"
 
-#, java-format
 #~ msgid "Style for inner way ''{0}'' equals multipolygon."
 #~ msgstr "Styl pro vnitřní cestu ''{0}'' odpovídá multipolygonu."
 
-#, java-format
 #~ msgid "Use the existing changeset {0} and close it after upload"
 #~ msgstr "Použít existující sadu změn {0} a zavřít ji po nahrání"
 
-#, java-format
 #~ msgid "Use the existing changeset {0} and leave it open"
 #~ msgstr "Použít existující sadu změn {0}  a ponechat ji  otevřenou"
 
-#, java-format
 #~ msgid ""
 #~ "Select to upload to the existing changeset {0} and to leave the changeset "
@@ -34525,5 +34768,4 @@
 #~ "vkládání dalších dat"
 
-#, java-format
 #~ msgid ""
 #~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
@@ -34531,6 +34773,8 @@
 #~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
 #~ msgstr[0] "V {0} vrstvě jsou neuložené změny. Zahodit změny a pokračovat?"
-#~ msgstr[1] "Ve {0} vrstvách jsou neuložené změny. Zahodit změny a pokračovat?"
-#~ msgstr[2] "Ve {0} vrstvách jsou neuložené změny. Zahodit změny a pokračovat?"
+#~ msgstr[1] ""
+#~ "Ve {0} vrstvách jsou neuložené změny. Zahodit změny a pokračovat?"
+#~ msgstr[2] ""
+#~ "Ve {0} vrstvách jsou neuložené změny. Zahodit změny a pokračovat?"
 
 #~ msgid "Close current changeset"
@@ -34549,9 +34793,7 @@
 #~ msgstr "Nahradit"
 
-#, java-format
 #~ msgid "Missing mandatory attribute ''{0}''"
 #~ msgstr "Chybějící povinný atribut ''{0}''"
 
-#, java-format
 #~ msgid ""
 #~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
@@ -34560,8 +34802,7 @@
 #~ "<html>Výběr \"{0}\" je použit v relaci \"{1}\".<br>Smazat z relace?</html>"
 
-#, java-format
 #~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-#~ "from relation?</html>"
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
 #~ msgstr ""
 #~ "<html>Výběr \"{0}\" je použit v relaci \"{1}\" s rolí {2}.<br>Smazat z "
@@ -34583,15 +34824,13 @@
 #~ msgstr "Vyberte počáteční bod na konci cesty"
 
-#, java-format
 #~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr "Chybí stránka nápovědy. Vytvořte ji v <A HREF=\"{0}\">češtině</A>."
 
-#, java-format
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
 #~ msgstr ""
-#~ "Chybí stránka nápovědy. Vytvořte ji v <A HREF=\"{0}\">angličtině</A> anebo "
-#~ "<A HREF=\"{1}\">ve vašem jazyce</A>."
+#~ "Chybí stránka nápovědy. Vytvořte ji v <A HREF=\"{0}\">angličtině</A> "
+#~ "anebo <A HREF=\"{1}\">ve vašem jazyce</A>."
 
 #~ msgid "Didn't find an primitive with id {0} in this dataset"
@@ -34603,11 +34842,10 @@
 
 #~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
 #~ msgstr ""
-#~ "Stránka s nápovědou chybí. Udělej jí v <A HREF=\"{0}\">angličtině</A> nebo  "
-#~ "<A HREF=\"{1}\">ve tvém jazyce</A>."
-
-#, java-format
+#~ "Stránka s nápovědou chybí. Udělej jí v <A HREF=\"{0}\">angličtině</A> "
+#~ "nebo  <A HREF=\"{1}\">ve tvém jazyce</A>."
+
 #~ msgid ""
 #~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
@@ -34617,23 +34855,18 @@
 #~ "konflikty vyřešeny.</html>"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' must not be null."
 #~ msgstr "parametr ''{0}'' nesmí být null"
 
-#, java-format
 #~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 #~ msgstr ""
-#~ "byla očekávána instance OsmDataLayer nebo GpxLayer, ale ve skutečnosti je: "
-#~ "''{0}''."
-
-#, java-format
+#~ "byla očekávána instance OsmDataLayer nebo GpxLayer, ale ve skutečnosti "
+#~ "je: ''{0}''."
+
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "Neočekávaná návratová hodnota. Navráceno {0}"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
 #~ msgstr "očekáván parameter ''{0}'' > 0, zadáno ''{1}''"
 
-#, java-format
 #~ msgid "Expected ID >= 0. Got {0}."
 #~ msgstr "očekáváno id >= 0. Nalezeno {0}"
@@ -34645,5 +34878,4 @@
 #~ msgstr "V historii není žádná verze platná k datu ''{0}''"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 #~ msgstr "parametr ''{0}'' očekáván v rozsahu 0..{1}, zadáno {2}"
@@ -34655,17 +34887,13 @@
 #~ msgstr "nenalezena novější verze. Historie je prázdná."
 
-#, java-format
 #~ msgid "Parameter current out of range. Got {0}."
 #~ msgstr "aktuální parametr je mimo rozsah: zadáno {0}"
 
-#, java-format
 #~ msgid "Unexpected column index. Got {0}."
 #~ msgstr "neočekávaný index sloupce. Zadáno {0}"
 
-#, java-format
 #~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
 #~ msgstr "Parametr 'col'  musí být 0 nebo 1. Zadáno {0}"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' must not be empty."
 #~ msgstr "parametr ''{0}'' nesmí být prázdný"
@@ -34674,17 +34902,13 @@
 #~ msgstr "Zobrazit historii vybraného prvku"
 
-#, java-format
 #~ msgid "Value of child.getId() > 0 expected. Got {1}."
 #~ msgstr "očekáváno child.getId() >0. Nalezeno {1}"
 
-#, java-format
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Nemůžu číst \"{0}\""
 
-#, java-format
 #~ msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 #~ msgstr "Neplatná hodnota pro atribut ''uid''. Nalezeno ''{0}''"
 
-#, java-format
 #~ msgid ""
 #~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
@@ -34692,32 +34916,31 @@
 #~ "nedovolená hodnota povinného atributu ''{0}'' typu int, zadáno ''{1}''"
 
-#, java-format
 #~ msgid ""
-#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
+#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got "
+#~ "''{1}''."
 #~ msgstr ""
-#~ "nedovolená hodnota povinného atributu ''{0}'' typu int (>=0), zadáno ''{1}''"
-
-#, java-format
+#~ "nedovolená hodnota povinného atributu ''{0}'' typu int (>=0), zadáno "
+#~ "''{1}''"
+
 #~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 #~ msgstr "očekáván parameter ''{0}'' >= 0, zadáno ''{1}''"
 
-#, java-format
 #~ msgid "Id > 0 required, got {0}"
 #~ msgstr "Očekáváno Id > 0, zadáno {0}"
 
-#, java-format
 #~ msgid ""
 #~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr "Nelze vzít zpět příkaz ''{0}'' protože vrstva ''{1}'' již neexistuje"
+#~ msgstr ""
+#~ "Nelze vzít zpět příkaz ''{0}'' protože vrstva ''{1}'' již neexistuje"
 
 #~ msgid ""
-#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
-#~ "the following\n"
+#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to "
+#~ "add the following\n"
 #~ "      Java option to increase the maximum size of allocated memory"
 #~ msgstr ""
-#~ "poznámka: Pro některé úlohy potrebuje JOSM velké množství paměti. Může být "
-#~ "třeba přidat následující\n"
-#~ "      konfigurační volby Javy aby se zvětšilo nastavení maximálního možného "
-#~ "využití ram"
+#~ "poznámka: Pro některé úlohy potrebuje JOSM velké množství paměti. Může "
+#~ "být třeba přidat následující\n"
+#~ "      konfigurační volby Javy aby se zvětšilo nastavení maximálního "
+#~ "možného využití ram"
 
 #~ msgid "Apply also for children"
@@ -34730,5 +34953,4 @@
 #~ msgstr "Dialog nebyl zatím vytvořen. Zavolejte nejprve createInstance()"
 
-#, java-format
 #~ msgid "Object id > 0 expected. Got {0}"
 #~ msgstr "Očekáváno id objektu > 0. Nalezeno {0}"
@@ -34746,37 +34968,33 @@
 #~ msgstr "Nápověda / O programu"
 
-#, java-format
 #~ msgid "Uploading {0} objects ..."
 #~ msgstr "Nahrávám {0} objektů ..."
 
-#, java-format
 #~ msgid "Parameter ''{0}'' must not be empty"
 #~ msgstr "Parametr ''{0}'' nesmí být prázdný"
 
-#, java-format
 #~ msgid ""
-#~ "<html><p class=\"warning-header\">Help content for help topic missing</p><p "
-#~ "class=\"warning-body\">Help content for the help topic <strong>{0}</strong> "
-#~ "is not available yet. It is missing both in your local language ({1}) and in "
-#~ "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>"
+#~ "<html><p class=\"warning-header\">Help content for help topic missing</"
+#~ "p><p class=\"warning-body\">Help content for the help topic <strong>{0}</"
+#~ "strong> is not available yet. It is missing both in your local language "
+#~ "({1}) and in 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>"
 #~ msgstr ""
 #~ "<html><p class=\"warning-header\">Nápověda k tomuto tématu chybí</p><p "
-#~ "class=\"warning-body\">Nápověda k tématu <strong>{0}</strong> není aktuálně "
-#~ "dostupná. Chybí jak pro váš lokální jazyk ({1}), tak pro "
+#~ "class=\"warning-body\">Nápověda k tématu <strong>{0}</strong> není "
+#~ "aktuálně dostupná. Chybí jak pro váš lokální jazyk ({1}), tak pro "
 #~ "angličtinu.<br><br>Prosím pomozte vylepšit nápovědu pro JOSM a doplňte "
 #~ "chybějící informace. Editovat můžete začít <a href=\"{2}\">obsah ve vašem "
 #~ "lokálním jazyce ({1})</a> a v <a href=\"{3}\">angličtině</a>.</p></html>"
 
-#, java-format
 #~ msgid ""
-#~ "<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-#~ "network problem, please check your<br>your internet connection</html>"
+#~ "<html>Failed to open help page for url {0}.<br>This is most likely due to "
+#~ "a network problem, please check your<br>your internet connection</html>"
 #~ msgstr ""
 #~ "<html>Nezdařilo se otevřít stránku nápovědy na url {0}.<br>Toto bývá "
-#~ "nejčastěji síťový problém, prosím prověřte<br>vaší internetovou "
-#~ "přípojku</html>"
+#~ "nejčastěji síťový problém, prosím prověřte<br>vaší internetovou přípojku</"
+#~ "html>"
 
 #~ msgid ""
@@ -34785,9 +35003,8 @@
 #~ "Hold left mousebutton and draw a frame."
 #~ msgstr ""
-#~ "<b>Zvětšení:</b> Kolečko myši, dvojklik nebo Ctrl + Up/Down <b>Posun "
-#~ "mapy:</b> Držet pravé tlačítko myši a pohyb myší nebo kurzorové klávesy. "
+#~ "<b>Zvětšení:</b> Kolečko myši, dvojklik nebo Ctrl + Up/Down <b>Posun mapy:"
+#~ "</b> Držet pravé tlačítko myši a pohyb myší nebo kurzorové klávesy. "
 #~ "<b>Výběr:</b> Držet pravá tlačítko myši a nakreslit rámeček."
 
-#, java-format
 #~ msgid "{0} Plugin successfully downloaded."
 #~ msgid_plural "{0} Plugins successfully downloaded."
@@ -34796,5 +35013,4 @@
 #~ msgstr[2] "{0} pluginů staženo úspěšně."
 
-#, java-format
 #~ msgid ""
 #~ "Loading of {0} plugin was requested. This plugin is no longer required."
@@ -34804,5 +35020,4 @@
 #~ msgstr "Vyhledávám dostupné překlady ..."
 
-#, java-format
 #~ msgid "Expected value > 0 for parameter ''{0}'', got {1}"
 #~ msgstr "Očekávaná hodnota > 0 pro parametr ''{0}'', nalezeno {1}"
@@ -34836,6 +35051,6 @@
 #~ "include all changesets in the query.</html>"
 #~ msgstr ""
-#~ "<html>Výběr omezí dotaz pouze na vaše sady změn.<br>Zrušení výběru zahrne do "
-#~ "dotazu všechny sady změn.</html>"
+#~ "<html>Výběr omezí dotaz pouze na vaše sady změn.<br>Zrušení výběru zahrne "
+#~ "do dotazu všechny sady změn.</html>"
 
 #~ msgid "At least one object to delete requird, got empty collection"
Index: /applications/editors/josm/i18n/po/da.po
===================================================================
--- /applications/editors/josm/i18n/po/da.po	(revision 21970)
+++ /applications/editors/josm/i18n/po/da.po	(revision 21971)
@@ -9,7 +9,7 @@
 "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:07+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2010-06-23 22:47+0200\n"
+"PO-Revision-Date: 2010-06-17 08:57+0000\n"
+"Last-Translator: Esben Damgaard <ebbe@skummer.com>\n"
 "Language-Team: Dansk <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,5 +17,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-06-15 16:21+0000\n"
+"X-Launchpad-Export-Date: 2010-06-23 20:23+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
@@ -253,5 +253,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
@@ -274,5 +274,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
@@ -280,6 +280,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
@@ -288,4 +290,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
@@ -323,9 +327,9 @@
 #, java-format
 msgid ""
-"<html>There are no layers the source layer<br>''{0}''<br>could be merged "
-"to.</html>"
-msgstr ""
-"<html>Der er ingen lag, kildelaget<br>''{0}''br>kunne flettes sammen "
-"med.</html>"
+"<html>There are no layers the source layer<br>''{0}''<br>could be merged to."
+"</html>"
+msgstr ""
+"<html>Der er ingen lag, kildelaget<br>''{0}''br>kunne flettes sammen med.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:81
@@ -348,9 +352,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
@@ -410,4 +414,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
@@ -447,5 +452,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 "Information"
@@ -658,5 +663,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
@@ -671,5 +676,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 "Slet"
@@ -918,4 +923,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 ""
@@ -926,4 +932,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 "Dette kan føre til at punkter bliver fejlagtigt slettet."
@@ -1180,5 +1187,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24
 msgid "Move Node..."
-msgstr ""
+msgstr "Flyt punkt..."
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24
@@ -1189,5 +1196,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
 msgid "New Layer"
-msgstr ""
+msgstr "Nyt lag"
 
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
@@ -1302,5 +1309,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
 msgid "Move nodes so all angles are 90 or 180 degrees"
-msgstr ""
+msgstr "Flyt punkter så alle vinkler er 90 eller 180 grader"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
@@ -1337,11 +1344,11 @@
 msgstr ""
 "<html>Du anvender EPSG:4326 projektion, som kan lede<br>til uhensigtsmæssige "
-"resultater i forbindelse med afstemning af rektangulære "
-"opstillinger.<br>Ændr din projektion for at slippe for denne "
-"advarsel.<br>Ønsker du at fortsætte?</html>"
+"resultater i forbindelse med afstemning af rektangulære opstillinger."
+"<br>Ændr din projektion for at slippe for denne advarsel.<br>Ønsker du at "
+"fortsætte?</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:148
 msgid "Selection must consist only of ways and nodes."
-msgstr ""
+msgstr "Markeringen må kun bestå af veje og punkter."
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:188
@@ -1366,5 +1373,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:417
 msgid "Please select ways with angles of approximately 90 or 180 degrees."
-msgstr ""
+msgstr "Vælg venligst veje med vinkler på cirka 90 eller 180 grader."
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
@@ -1490,6 +1497,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
@@ -1516,4 +1523,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
@@ -1522,6 +1531,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 "Fejl"
@@ -1637,8 +1646,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
-msgid ""
-"Show status report with useful information that can be attached to bugs"
-msgstr ""
-"Vis statusrapport med brugbare informationer, der kan tilknyttes fejl."
+msgid "Show status report with useful information that can be attached to bugs"
+msgstr "Vis statusrapport med brugbare informationer, der kan tilknyttes fejl."
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42
@@ -1673,8 +1680,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 ""
+msgstr "Ja, slet punkter"
 
 #: ../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 ""
@@ -1683,5 +1692,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 "Nej, afbryd"
@@ -1689,16 +1699,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 "Afbryd operation"
 
 #: ../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 ""
+msgstr "Vil du slette dem alligevel?"
 
 #: ../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 "Vælg venligst mindst en vej at forenkle"
@@ -1707,30 +1722,36 @@
 #: ../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 "Ja"
 
 #: ../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 ""
+msgstr "Forenkl alle valgte veje"
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:126
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:89
 #, java-format
 msgid ""
 "The selection contains {0} ways. Are you sure you want to simplify them all?"
-msgstr ""
+msgstr "Markeringen indeholder {0} veje. Er du sikker på du vil forenkle alle?"
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:129
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:89
 msgid "Simplify ways?"
-msgstr ""
+msgstr "Forenkl veje?"
 
 #: ../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"
 msgid_plural "Simplify {0} ways"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Forenkl {0} vej"
+msgstr[1] "Forenkl {0} veje"
 
 #: ../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)"
@@ -1798,6 +1819,6 @@
 "should verify this and correct it when necessary.</html>"
 msgstr ""
-"<html>Et rollebaseret relationsmedlemsskab blev kopieret til alle nye "
-"veje.<br>Du bør kontrollere dette og om nødvendigt korrigere det.</html>"
+"<html>Et rollebaseret relationsmedlemsskab blev kopieret til alle nye veje."
+"<br>Du bør kontrollere dette og om nødvendigt korrigere det.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
@@ -1866,6 +1887,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 "* Et punkt, som bruges af mere end én vej og en af disse veje, eller"
 
@@ -1938,9 +1958,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)"
@@ -1957,5 +1977,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
@@ -1991,6 +2011,5 @@
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
-msgstr ""
-"Opdaterer de nu markerede objekter fra serveren (gen-downloader data)"
+msgstr "Opdaterer de nu markerede objekter fra serveren (gen-downloader data)"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
@@ -2021,5 +2040,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 "Ingen ændringer at uploade."
@@ -2037,14 +2055,14 @@
 msgstr "Upload alle ændringer i markeringen til OSM serveren"
 
-#: ../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 "Kontrollerer forældre for slettede objekter"
 
-#: ../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 "Læser forældre til \"{0}\""
 
-#: ../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 "Ser efter slettede forældre i det lokale datasæt"
@@ -2302,5 +2320,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
@@ -2419,6 +2437,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 ""
 "Træk spillehoved og slip nær spor for at afspille lyd derfra; SHIFT+slip for "
@@ -2557,5 +2575,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."
@@ -2592,5 +2610,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "all objects"
-msgstr ""
+msgstr "alle objekter"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161
@@ -2609,6 +2627,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
-msgstr ""
-"<b>\"Baker Street\"</b> - ''Baker Street'' i enhver nøgle eller navn."
+msgstr "<b>\"Baker Street\"</b> - ''Baker Street'' i enhver nøgle eller navn."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
@@ -2680,6 +2697,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 ""
 "<b>punkter:</b>... - objekt med givet antal punkter (punkter:tæl eller "
@@ -2742,6 +2759,6 @@
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
-"Brug <b>\"</b> til at anføre operatorer (f.eks. hvis nøgle indeholder "
-"<b>:</b>)"
+"Brug <b>\"</b> til at anføre operatorer (f.eks. hvis nøgle indeholder <b>:</"
+"b>)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
@@ -2851,6 +2868,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
-msgstr ""
-"Nøgle kan ikke være tom når tag operatør bruges. Eksempel: nøgle=værdi"
+msgstr "Nøgle kan ikke være tom når tag operatør bruges. Eksempel: nøgle=værdi"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:462
@@ -2936,7 +2952,7 @@
 "dependency.</html>"
 msgstr ""
-"<html>{0} relationer skaber en cyklus, fordi de refererer til "
-"hinanden.<br>JOSM kan ikke uploade dem. Redigér venligst relationerne og "
-"fjern den cirkulære afhængighed.</html>"
+"<html>{0} relationer skaber en cyklus, fordi de refererer til hinanden."
+"<br>JOSM kan ikke uploade dem. Redigér venligst relationerne og fjern den "
+"cirkulære afhængighed.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
@@ -2967,10 +2983,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
@@ -3060,5 +3080,5 @@
 #, java-format
 msgid "Set {0}={1} for {2} objects"
-msgstr ""
+msgstr "Sæt {0}={1} for {2} objekter"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69
@@ -3096,5 +3116,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
@@ -3124,15 +3144,15 @@
 #, java-format
 msgid "Delete node {0}"
-msgstr ""
+msgstr "Slet punkt {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
 #, java-format
 msgid "Delete way {0}"
-msgstr ""
+msgstr "Slet vej {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
 #, java-format
 msgid "Delete relation {0}"
-msgstr ""
+msgstr "Slet relation {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
@@ -3167,5 +3187,5 @@
 #, java-format
 msgid "Deleted ''{0}''"
-msgstr ""
+msgstr "Slettede \"{0}\""
 
 #. leave message in one tr() as there is a grammatical
@@ -3174,7 +3194,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 ""
 "Du er ved at slette punkter uden for det område du har downloadet.<br>Dette "
@@ -3223,11 +3243,11 @@
 msgstr[1] "Flyt {0} punkter"
 
-#: ../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 "Udrensede objekt ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111
 #, java-format
 msgid "Purged {0} object"
@@ -3236,5 +3256,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 #, java-format
 msgid ""
@@ -3245,5 +3265,5 @@
 "er {1}"
 
-#: ../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}"
@@ -3465,9 +3485,9 @@
 #, java-format
 msgid ""
-"<html>Preferences file had errors.<br> Making backup of old one to "
-"<br>{0}<br> and creating a new default preference file.</html>"
-msgstr ""
-"<html>Indstillingsfilen havde fejl.<br> Laver backup af den gamle til "
-"<br>{0}<br> og opretter en ny standard-indstillingsfil.</html>"
+"<html>Preferences file had errors.<br> Making backup of old one to <br>{0}"
+"<br> and creating a new default preference file.</html>"
+msgstr ""
+"<html>Indstillingsfilen havde fejl.<br> Laver backup af den gamle til <br>{0}"
+"<br> og opretter en ny standard-indstillingsfil.</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
@@ -3542,6 +3562,5 @@
 msgid ""
 "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
-msgstr ""
-"Advarsel: Uventet JOSM versionsnummer i revisionsfil, værdi er \"{0}\""
+msgstr "Advarsel: Uventet JOSM versionsnummer i revisionsfil, værdi er \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:145
@@ -3556,5 +3575,5 @@
 #. *
 #. * the decimal format 999.999
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3563,5 +3582,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3570,5 +3589,5 @@
 #. *
 #. * coordinates East/North
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3620,4 +3639,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}"
@@ -3629,33 +3651,24 @@
 msgstr "Manglende sammenlægningsmål for objekt med id {0}"
 
-#: ../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 "Manglende sammenlægningsmål for punkt med id {0}"
 
-#: ../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 "Manglende sammenlægningsmål for relation med id {0}"
 
-#: ../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 "Manglende sammenlægningsmål af type {0} med id {1}"
-
-#. 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 ""
-"Målobjekt med id {0} og version {1} er synlig selvom kildeobjekt med lavere "
-"version {2} ikke er synlig. Kan ikke håndtere denne inkonsistens. Beholder "
-"målobjekt. "
 
 #. translators notes must be in front
@@ -3722,5 +3735,5 @@
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
-msgstr ""
+msgstr "<p><b>{0}</b> objekter skjult"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:459
@@ -3733,19 +3746,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 "En primitiv med ID = 0 kan ikke være usynlig."
 
-#: ../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 "ID > 0 forventet. Fik {0}."
 
-#: ../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 "Version > 0 forventet. Fik {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:795
 #, java-format
 msgid ""
@@ -3756,5 +3769,5 @@
 "er {0}."
 
-#: ../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 "
@@ -3762,5 +3775,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 ""
@@ -3820,6 +3833,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 ""
 "Kan ikke sammenligne primitiv med ID \"{0}\" med primitiv med ID \"{1}\"."
@@ -3835,5 +3847,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 "valgt"
@@ -3999,8 +4011,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
 #, java-format
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-"<html>Kunne ikke læse bogmærker fra<br>''{0}''<br>Fejl var: {1}</html>"
+msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr "<html>Kunne ikke læse bogmærker fra<br>''{0}''<br>Fejl var: {1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
@@ -4070,5 +4080,5 @@
 #. color tiger_data
 #. </rule>
-#. 
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4078,5 +4088,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4085,5 +4095,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4092,5 +4102,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4099,5 +4109,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4106,5 +4116,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4113,9 +4123,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--annotation tags -->
-#. 
+#.
 #. <!--"work in progress" tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="building"/>
@@ -4124,5 +4134,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 "bygning"
@@ -4209,5 +4219,5 @@
 msgstr "Objekt slettet"
 
-#: ../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
@@ -4430,6 +4440,5 @@
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
-msgstr ""
-"Indstilling {0} er blevet fjernet eftersom den ikke længere er i brug."
+msgstr "Indstilling {0} er blevet fjernet eftersom den ikke længere er i brug."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
@@ -4439,5 +4448,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
@@ -4446,4 +4455,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
@@ -4612,6 +4622,6 @@
 "relations</strong>.</html>"
 msgstr ""
-"<html>Bekræft venligst for at fjerne <strong>1 objekt</strong> fra "
-"<strong>{0} relationer</strong>.</html>"
+"<html>Bekræft venligst for at fjerne <strong>1 objekt</strong> fra <strong>"
+"{0} relationer</strong>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156
@@ -4652,5 +4662,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
@@ -4689,6 +4699,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 ""
 
@@ -4719,5 +4729,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"
@@ -4726,5 +4736,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"
@@ -4733,5 +4743,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"
@@ -4961,6 +4971,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 ""
 "Kopiér deres markerede elementer til enden af listen over sammenlagte "
@@ -5046,6 +5055,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their "
-"entries.</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 "<html>Klik <strong>{0}</strong> for at begynde at sammenlægge mine og deres "
@@ -5055,6 +5064,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their "
-"entries.</html>"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
+"html>"
 msgstr ""
 "<html>Klik <strong>{0}</strong> for at afslutte sammenlægning af mine og "
@@ -5110,6 +5119,6 @@
 #, java-format
 msgid ""
-"<html>An error occurred while communicating with the server<br>Details: "
-"{0}</html>"
+"<html>An error occurred while communicating with the server<br>Details: {0}</"
+"html>"
 msgstr ""
 "<html>En fejl opstod under kommunikation med serveren<br>Detaljer: {0}</html>"
@@ -5332,10 +5341,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"
@@ -5344,10 +5355,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
@@ -5429,4 +5442,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 "intet"
@@ -5596,6 +5610,6 @@
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
 msgstr ""
-"<html>Indtast en tag værdi, f.eks. <strong><tt>Tjek "
-"medlemmer</tt></strong></html>"
+"<html>Indtast en tag værdi, f.eks. <strong><tt>Tjek medlemmer</tt></strong></"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
@@ -5610,9 +5624,9 @@
 "<html>De kombinerede veje er medlemmer i en eller flere relationer. Afgør "
 "venligst om du ønsker at <strong>beholde</strong> disse medlemsskaber for "
-"den kombinerede vej eller om du ønsker at <strong>fjerne</strong> "
-"dem.<br>Standard er at <strong>beholde</strong> den første vej og "
+"den kombinerede vej eller om du ønsker at <strong>fjerne</strong> dem."
+"<br>Standard er at <strong>beholde</strong> den første vej og "
 "<strong>fjerne</strong> de andre veje, der er medlemmer af den samme "
-"relation: den kombinerede vej vil erstatte den originale vej i "
-"relationen.</html>"
+"relation: den kombinerede vej vil erstatte den originale vej i relationen.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
@@ -5627,6 +5641,6 @@
 "<html>De sammenlagte punkter er medlemmer i en eller flere relationer. Afgør "
 "venligst om du ønsker at <strong>beholde</strong> disse medlemsskaber for "
-"den målpunktet eller om du ønsker at <strong>fjerne</strong> "
-"dem.<br>Standard er at <strong>beholde</strong> det første punkt og "
+"den målpunktet eller om du ønsker at <strong>fjerne</strong> dem."
+"<br>Standard er at <strong>beholde</strong> det første punkt og "
 "<strong>fjerne</strong> de andre punkter, der er medlemmer af den samme "
 "relation: målpunktet vil erstatte det originale punkt i relationen.</html>"
@@ -5647,6 +5661,6 @@
 msgid "<html>Please select the values to keep for the following tags.</html>"
 msgstr ""
-"<html>Marker venligst de værdier der skal beholdes for de følgende "
-"tags.</html>"
+"<html>Marker venligst de værdier der skal beholdes for de følgende tags.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:48
@@ -5664,11 +5678,11 @@
 #: ../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>"
-msgstr ""
-"Markér for kun at vise rettesæt for de aktuelt markerede "
-"objekter.<br>Afmarkér for at vise alle rettesæt for objekter i det aktuelle "
-"data lag.</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 ""
+"Markér for kun at vise rettesæt for de aktuelt markerede objekter."
+"<br>Afmarkér for at vise alle rettesæt for objekter i det aktuelle data lag."
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
@@ -5692,6 +5706,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 "Download information om de markerede rettesæt fra OSM serveren"
 
@@ -5737,5 +5750,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
@@ -5812,10 +5825,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 ""
 
@@ -5838,5 +5850,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
@@ -5844,5 +5856,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 "Tilføj"
@@ -5891,5 +5903,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 "Historik"
@@ -6110,10 +6122,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 "Markér i relationsliste"
 
 #: ../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 "Markér relation i relationsliste."
@@ -7362,6 +7374,5 @@
 "Select the primitives in the content of this changeset in the current data "
 "layer"
-msgstr ""
-"Markér primitiverne i dette rettesæts indhold i det nuværende datalag"
+msgstr "Markér primitiverne i dette rettesæts indhold i det nuværende datalag"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:365
@@ -7600,10 +7611,9 @@
 #, 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>"
-msgstr ""
-"Indtast venligst en dato i det normale format for din "
-"lokalitet.<br>Eksempel: {0}<br>Eksempel: {1}<br>Eksempel: {2}<br>Eksempel: "
-"{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 ""
+"Indtast venligst en dato i det normale format for din lokalitet."
+"<br>Eksempel: {0}<br>Eksempel: {1}<br>Eksempel: {2}<br>Eksempel: {3}<br>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1127
@@ -7613,7 +7623,6 @@
 "{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
 msgstr ""
-"Indtast venligst en gyldig tid i det normale format for din "
-"lokalitet.<br>Eksempel: {0}<br>Eksempel: {1}<br>Eksempel: {2}<br>Eksempel: "
-"{3}<br>"
+"Indtast venligst en gyldig tid i det normale format for din lokalitet."
+"<br>Eksempel: {0}<br>Eksempel: {1}<br>Eksempel: {2}<br>Eksempel: {3}<br>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:108
@@ -7629,8 +7638,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 ""
 
@@ -7755,9 +7764,9 @@
 msgstr "Denne rettesætsforespørgselsURL er ugyldig"
 
-#: ../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 "Tilføj egenskaber"
 
-#: ../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."
@@ -7766,23 +7775,23 @@
 msgstr[1] "Dette vil ændre op til {0} objekter."
 
-#: ../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 "En tom værdi sletter taggen."
 
-#: ../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 "<forskellige>"
 
-#: ../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 "Ret værdier?"
 
-#: ../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"
@@ -7791,5 +7800,5 @@
 msgstr[1] "Ret egenskaber for op til {0} objekter"
 
-#: ../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."
@@ -7798,77 +7807,77 @@
 msgstr[1] "Dette vil ændre på op til {0} objekter."
 
-#: ../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 "Vælg venligst en nøgle"
 
-#: ../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 "Vælg venligst en værdi"
 
-#: ../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 "Vælg de objekter, du vil rette egenskaber for."
 
-#: ../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 "Egenskaber/medlemsskaber"
 
-#: ../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 "Egenskaber for valgte objekter."
 
 #. 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 "Medlem af"
 
-#: ../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 "Egenskaber: {0} / Medlemskaber: {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 "Egenskaber / Medlemskaber"
 
-#: ../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 "Skift relation"
 
-#: ../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 "Slet fra relation"
 
-#: ../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 "Slet virkelig det markerede fra relation {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 "Fjern den valgte nøgle i alle objekter"
 
-#: ../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 "Fjern egenskaber"
 
-#: ../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 "Tilføj et nyt nøgle/værdi-sæt til alle objekter"
 
-#: ../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 "Ret værdien for den valgte nøgle for alle objekter"
 
-#: ../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 "Markér relation"
 
-#: ../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 "Vælg relation i hovedmarkering."
@@ -7985,11 +7994,10 @@
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
-"relation itself.<br>This creates circular dependencies and is "
-"discouraged.<br>How do you want to proceed with circular dependencies?</html>"
+"relation itself.<br>This creates circular dependencies and is discouraged."
+"<br>How do you want to proceed with circular dependencies?</html>"
 msgstr ""
 "<html>Der er mindst et medlem i denne relation, der refererer<br>til "
-"relationen selv.<br>Dette medfører cirkulære afhængigheder og "
-"frarådes.<br>Hvordan ønsker du at fortsætte med cirkulære "
-"afhængigheder?</html>"
+"relationen selv.<br>Dette medfører cirkulære afhængigheder og frarådes."
+"<br>Hvordan ønsker du at fortsætte med cirkulære afhængigheder?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
@@ -8006,6 +8014,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 ""
 "<html>Denne relation har allerede en eller flere medlemmer der refererer "
@@ -8180,7 +8188,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 ""
 "<html>Lag ''{0}'' har allerede en konflikt for primitiv<br>''{1}''.<br>Løs "
@@ -8524,11 +8531,10 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is "
-"enabled.<br>Please chose to either download OSM data, or GPX data, or "
-"both.</html>"
-msgstr ""
-"<html>Hverken <strong>{0}</strong> eller <strong>{1}</strong> er slået "
-"til.<br>Vælg venligst enten at downloade OSM-data, GPX-data eller begge "
-"dele.</html>"
+"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
+"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
+msgstr ""
+"<html>Hverken <strong>{0}</strong> eller <strong>{1}</strong> er slået til."
+"<br>Vælg venligst enten at downloade OSM-data, GPX-data eller begge dele.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
@@ -8668,6 +8674,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 ""
 
@@ -8677,6 +8683,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 ""
 
@@ -8796,6 +8802,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302
 msgid "History not initialized yet. Failed to set current primitive."
-msgstr ""
-"Historik ikke initialiseret endnu. Kunne ikke lave nuværende primitiv."
+msgstr "Historik ikke initialiseret endnu. Kunne ikke lave nuværende primitiv."
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307
@@ -8962,9 +8967,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 ""
 "<html>Upload <strong>fejlede</strong> fordi serveren har en nyere version af "
@@ -8973,6 +8977,6 @@
 "{2}, din version er {3}.<br><br>Klik <strong>{4}</strong> for kun at "
 "synkronisere den konfliktende primitiv.<br>Klik <strong>{5}</strong> for at "
-"synkronisere hele det lokale datasæt med serveren.<br>Klik "
-"<strong>{6}</strong> for at afbryde og fortsætte redigering.<br></html>"
+"synkronisere hele det lokale datasæt med serveren.<br>Klik <strong>{6}</"
+"strong> for at afbryde og fortsætte redigering.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
@@ -8986,14 +8990,12 @@
 msgid ""
 "<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click "
-"<strong>{0}</strong> to synchronize the entire local dataset with the "
-"server.<br>Click <strong>{1}</strong> to abort and continue "
-"editing.<br></html>"
+"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
+"</strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{1}</strong> to abort and continue editing.<br></html>"
 msgstr ""
 "<html>Upload <strong>fejlede</strong> fordi serveren har en nyere version af "
-"en<br>af dine punkter, veje eller relationer.<br><br>Klik "
-"<strong>{0}</strong> for at synkronisere hele det lokale datasæt med "
-"serveren..<br>Klik <strong>{1}</strong> for at afbryde og fortsætte "
-"redigering.<br></html>"
+"en<br>af dine punkter, veje eller relationer.<br><br>Klik <strong>{0}</"
+"strong> for at synkronisere hele det lokale datasæt med serveren..<br>Klik "
+"<strong>{1}</strong> for at afbryde og fortsætte redigering.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194
@@ -9260,5 +9262,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 "Nej"
@@ -9266,6 +9268,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 "Lag \"{0}\" har ændringer som bør uploades til serveren."
 
@@ -9355,6 +9356,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] ""
 "<html>{0} lag bør gemmes, men har ingen tilknyttet fil.<br>Vælg enten en fil "
@@ -9372,6 +9373,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 "
@@ -9597,5 +9598,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9625,6 +9626,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 "Rettesættet vil blive <strong>lukket</strong> efter denne upload"
 
@@ -9691,6 +9691,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 ""
 "Uploader <strong>{0} objekter</strong> til <strong>flere rettesæt</strong> "
@@ -9746,7 +9746,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 ""
 
@@ -9756,5 +9756,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9772,5 +9772,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..."
@@ -9781,6 +9781,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 ""
 "Ignorerer fanget undtagelse fordi upload blev annulleret. Undtagelse er: {0}"
@@ -9813,6 +9812,5 @@
 #, java-format
 msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
-msgstr ""
-"Advarsel: uventet værdi for nøgle ''{0}'' i indstillinger. Fik ''{1}''"
+msgstr "Advarsel: uventet værdi for nøgle ''{0}'' i indstillinger. Fik ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94
@@ -10012,11 +10010,11 @@
 #, 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>"
-msgstr ""
-"<html>Dataene i GPX-laget ''{0}'' er blevet downloadet fra "
-"serveren.<br>Fordi dets waypoints ikke indeholder et tidsstempel kan vi ikke "
-"finde ud af hvordan de hænger sammen med lyddata.</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 ""
+"<html>Dataene i GPX-laget ''{0}'' er blevet downloadet fra serveren."
+"<br>Fordi dets waypoints ikke indeholder et tidsstempel kan vi ikke finde ud "
+"af hvordan de hænger sammen med lyddata.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
@@ -10041,11 +10039,11 @@
 #, 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>"
-msgstr ""
-"<html>Dataene i GPX-laget ''{0}'' er blevet downloadet fra "
-"serveren.<br>Fordi dets waypoints ikke indeholder et tidsstempel kan vi ikke "
-"finde ud af hvordan de hænger sammen med billeder.</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 ""
+"<html>Dataene i GPX-laget ''{0}'' er blevet downloadet fra serveren."
+"<br>Fordi dets waypoints ikke indeholder et tidsstempel kan vi ikke finde ud "
+"af hvordan de hænger sammen med billeder.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
@@ -10108,6 +10106,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 ""
 "<html>Upload af ubehandlede GPS-data som kortdata betragtes som skadeligt "
@@ -10300,6 +10298,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 ""
 "<html>Upload af ubehandlede GPS-data som kortdata betragtes som skadeligt "
@@ -10361,7 +10359,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 ""
 "<html>Tag et billede af din GPS-modtager, mens den viser klokken.<br>Vis "
@@ -10553,6 +10551,5 @@
 "The selected GPX track does not contain timestamps. Please select another "
 "one."
-msgstr ""
-"Det valgte GPX-spor rummer ikke tidsstempler. Vælg venligst et andet."
+msgstr "Det valgte GPX-spor rummer ikke tidsstempler. Vælg venligst et andet."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
@@ -10662,6 +10659,6 @@
 "permanently lost!</h3></html>"
 msgstr ""
-"<html><h3>Slet filen {0} fra disk?<p>Billedfilen vil gå permanent "
-"tabt!</h3></html>"
+"<html><h3>Slet filen {0} fra disk?<p>Billedfilen vil gå permanent tabt!</"
+"h3></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
@@ -10810,6 +10807,5 @@
 "You need to have paused audio at the point on the track where you want the "
 "marker."
-msgstr ""
-"Du skal pause lyden på det punkt på sporet, hvor du vil have markøren."
+msgstr "Du skal pause lyden på det punkt på sporet, hvor du vil have markøren."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
@@ -10898,7 +10894,6 @@
 "to use the Access Token in this JOSM session only.</html>"
 msgstr ""
-"<html>Markér for at gemme adgangsudtrykket i JOSM-"
-"indstillingerne.<br>Afmarkér for kun at bruge adgangsudtrykket i denne JOSM-"
-"session.</html>"
+"<html>Markér for at gemme adgangsudtrykket i JOSM-indstillingerne."
+"<br>Afmarkér for kun at bruge adgangsudtrykket i denne JOSM-session.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
@@ -10929,6 +10924,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
 msgid "Click to reset the OAuth settings to default values"
-msgstr ""
-"Klik for at sætte OAuth indstillingerne tilbage til standardværdierne"
+msgstr "Klik for at sætte OAuth indstillingerne tilbage til standardværdierne"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
@@ -10941,7 +10935,6 @@
 "current custom settings are not saved.</html>"
 msgstr ""
-"<html>JOSM er ved at sætte OAuth indstillingerne tilbage til "
-"standarden.<br>De nuværende brugerdefinerede indstillinger bliver ikke "
-"slettet.</html>"
+"<html>JOSM er ved at sætte OAuth indstillingerne tilbage til standarden."
+"<br>De nuværende brugerdefinerede indstillinger bliver ikke slettet.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
@@ -10965,6 +10958,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 ""
 "<html>Kør en fuldautomatisk procedure for at få et adgangsudtryk fra OSM-"
@@ -10996,8 +10989,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 ""
 
@@ -11118,7 +11111,6 @@
 "<html>Den automatiske proces for erhvervelse af et OAuth "
 "adgangsudtryk<br>fra OSM-serveren fejlede fordi JOSM ikke var i stand til at "
-"opbygge<br>et gyldigt loginURL udfra OAuth Authorise Endpoint URL "
-"''{0}''.<br><br>Kontrollér venligst din avancerede indstilling og prøv "
-"igen.</html>"
+"opbygge<br>et gyldigt loginURL udfra OAuth Authorise Endpoint URL ''{0}''."
+"<br><br>Kontrollér venligst din avancerede indstilling og prøv igen.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:490
@@ -11126,11 +11118,11 @@
 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 ""
 "<html>Den automatiske proces for erhvervelse af et OAuth "
-"adgangsudtryk<br>fra OSM-serveren fejlede. JOSM kunne ikke logge ind i  "
-"{0}<br>for bruger {1}.<br><br>Kontrollér venligst brugernavn og adgangskode "
-"og prøv igen.</html>"
+"adgangsudtryk<br>fra OSM-serveren fejlede. JOSM kunne ikke logge ind i  {0}"
+"<br>for bruger {1}.<br><br>Kontrollér venligst brugernavn og adgangskode og "
+"prøv igen.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:58
@@ -11246,6 +11238,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 ""
 "Kunne ikke autentikere bruger ''{0}'' med adgangskode ''***'' som OAuth-"
@@ -11323,6 +11314,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
 msgid "Select to grant JOSM the right to write your server preferences"
-msgstr ""
-"Markér for at give JOSM retten til at skrive dine serverindstillinger"
+msgstr "Markér for at give JOSM retten til at skrive dine serverindstillinger"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
@@ -11384,8 +11374,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 ""
 
@@ -11468,8 +11458,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 ""
 
@@ -11500,7 +11490,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 ""
 "<html>Testen fejlede fordi serveren meldte en intern fejl.<br>JOSM kunne "
@@ -11555,5 +11545,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 "Vælg venligst rækken, der skal slettes"
@@ -11927,6 +11917,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 ""
 "Tegn retningspile ved hjælp af tabelopslag i stedet for kompleks matematik."
@@ -11937,6 +11926,5 @@
 "Do not draw arrows if they are not at least this distance away from the last "
 "one."
-msgstr ""
-"Tegn ikke pile, hvis de ikke er mindst denne afstand fra den forrige."
+msgstr "Tegn ikke pile, hvis de ikke er mindst denne afstand fra den forrige."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
@@ -11967,6 +11955,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 msgid "Allows to tune the track coloring for different average speeds."
-msgstr ""
-"Tillader at justere sporfarven for forskellige gennemsnitshastigheder."
+msgstr "Tillader at justere sporfarven for forskellige gennemsnitshastigheder."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
@@ -11989,6 +11976,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 "Brug udjævning på kortvisningen for et mere glat udseende."
 
@@ -12061,5 +12047,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 "Slå indbyggede standarder til"
@@ -12079,6 +12065,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>:"
@@ -12203,6 +12188,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 ""
 
@@ -12215,9 +12200,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 ""
 
@@ -12518,9 +12503,9 @@
 #, java-format
 msgid ""
-"<html>Failed to load the list of style sources "
-"from<br>''{0}''.<br><br>Details (untranslated):<br>{1}</html>"
-msgstr ""
-"<html>Kunne ikke indlæse listen over stilkilder "
-"fra<br>''{0}''.<br><br>Detaljer (uoversat):<br>{1}</html>"
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+"<html>Kunne ikke indlæse listen over stilkilder fra<br>''{0}''."
+"<br><br>Detaljer (uoversat):<br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
@@ -12530,5 +12515,5 @@
 msgstr "Advarsel: Ulovligt format for linje i stilliste ''{0}''. Fik ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #, java-format
 msgid ""
@@ -12538,18 +12523,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 ""
@@ -12558,5 +12543,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 ""
@@ -12565,5 +12550,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 ""
@@ -12572,9 +12557,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 "Sortér menu med fordefinerede tags"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
 msgid "Tagging Presets"
 msgstr "Fordefinerede tags"
@@ -12687,10 +12672,9 @@
 #, 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>"
-msgstr ""
-"<html>Kunne ikke forme URL ''{0}'' for validering af OSM API "
-"serveren.<br>Kontrollér venligst stavningen af ''{1}'' og validér "
-"igen.</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 ""
+"<html>Kunne ikke forme URL ''{0}'' for validering af OSM API serveren."
+"<br>Kontrollér venligst stavningen af ''{1}'' og validér igen.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
@@ -12711,10 +12695,10 @@
 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 ""
 "<html>Kunne ikke hente en liste over rettesæt fra OSM API serveren "
-"på<br>''{1}''. Serveren meldte tilbage med koden  {0} i stedet for "
-"200.<br>Kontrollér venligst stavningen af ''{1}'' og validér igen.</html>"
+"på<br>''{1}''. Serveren meldte tilbage med koden  {0} i stedet for 200."
+"<br>Kontrollér venligst stavningen af ''{1}'' og validér igen.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
@@ -12725,7 +12709,7 @@
 "spelling of ''{0}'' and validate again.</html>"
 msgstr ""
-"<html>OSM API serveren på ''{0}'' meldte ikke tilbage med et gyldigt "
-"svar.<br>Det er sandsynligt at \"{0}\" ikke er en OSM API "
-"server.<br>Kontroller venligst stavemåden af \"{0}\" og validér igen.</html>"
+"<html>OSM API serveren på ''{0}'' meldte ikke tilbage med et gyldigt svar."
+"<br>Det er sandsynligt at \"{0}\" ikke er en OSM API server.<br>Kontroller "
+"venligst stavemåden af \"{0}\" og validér igen.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
@@ -12783,11 +12767,10 @@
 "Adgangskoden bliver gemt som simpel tekst i JOSMs indstillingsfil. Desuden "
 "bliver det overført <strong>ukrypteret</strong> ved hver eneste forespørgsel "
-"til OSM-serveren. <strong>Anvend ikke en værdifuld "
-"adgangskode..</strong></p></body></html>"
+"til OSM-serveren. <strong>Anvend ikke en værdifuld adgangskode..</strong></"
+"p></body></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:117
 msgid "Warning: failed to retrieve OSM credentials from credential manager."
-msgstr ""
-"Advarsel: Kunne ikke hente OSM-brugerinfo fra brugerinfo-håndteringen."
+msgstr "Advarsel: Kunne ikke hente OSM-brugerinfo fra brugerinfo-håndteringen."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:118
@@ -12804,6 +12787,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 ""
 
@@ -12819,6 +12801,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 ""
 
@@ -12914,9 +12895,9 @@
 #: ../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)"
-msgstr ""
-"Brug standardsystemindstillinger (slået fra. Start JOSM med <tt>-"
-"Djava.net.useSystemProxies=true</tt> for at slå til)"
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+"Brug standardsystemindstillinger (slået fra. Start JOSM med <tt>-Djava.net."
+"useSystemProxies=true</tt> for at slå til)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:256
@@ -13051,4 +13032,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 "Ret egenskaber"
@@ -13223,5 +13205,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
@@ -13243,5 +13225,5 @@
 msgstr "Fortolker svar fra server..."
 
-#: ../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}''"
@@ -13410,6 +13392,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 ""
 
@@ -13513,6 +13494,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:165
 msgid "This version of JOSM is incompatible with the configured server."
-msgstr ""
-"Denne version af JOSM er ikke kompatibel med den konfigurerede server."
+msgstr "Denne version af JOSM er ikke kompatibel med den konfigurerede server."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:166
@@ -13531,81 +13511,80 @@
 
 #: ../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 "Uventet ID-format svaret af serveren. Fik \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:278
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
 "Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
-msgstr ""
-"Uventet format af ny version af ændret primitiv \"{0}\". Fik  \"{1}\"."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312
+msgstr "Uventet format af ny version af ændret primitiv \"{0}\". Fik  \"{1}\"."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
 msgid "Creating changeset..."
 msgstr "Opretter rettesæt..."
 
-#: ../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 "Åbnede med succes rettesæt {0}"
 
-#: ../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 "Rettesæts-ID > 0 forventet. Fik {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349
 msgid "Updating changeset..."
 msgstr "Opdaterer rettesæt..."
 
-#: ../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 "Opdaterer rettesæt {0}..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:388
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389
 msgid "Closing changeset..."
 msgstr "Lukker rettesæt..."
 
-#: ../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 "Ingen rettesæt tilstede for diff-upload"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
 msgid "Preparing upload request..."
 msgstr "Forbereder upload-forespørgsel..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447
 msgid "Waiting 10 seconds ... "
 msgstr "Venter 10 sekunder ... "
 
-#: ../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 "Starter forsøg {0} af {1} igen om {2} sekunder ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:458
 msgid "OK - trying again."
 msgstr "OK - prøver igen"
 
-#: ../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 "Starter forsøg {0} af {1} igen."
 
-#: ../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 "Nuværende rettesæt er null. Kan ikke uploade data."
 
-#: ../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 "Rettesæt med ID > 0 krævet. Nuværende ID er {0}."
 
-#: ../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}."
@@ -13683,6 +13662,6 @@
 "''{1}''."
 msgstr ""
-"Ulovlig værdi af obligatorisk attribut \"{0}\" af type long (>=0). Fik "
-"\"{1}\"."
+"Ulovlig værdi af obligatorisk attribut \"{0}\" af type long (>=0). Fik \"{1}"
+"\"."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:112
@@ -13731,6 +13710,6 @@
 "''create'', ''modify'', or ''delete''."
 msgstr ""
-"Ulovlig dokument struktur. Fandt punkt, vej eller relation udenfor "
-"\"create\", \"modify\" eller \"delete\"."
+"Ulovlig dokument struktur. Fandt punkt, vej eller relation udenfor \"create"
+"\", \"modify\" eller \"delete\"."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:259
@@ -13800,4 +13779,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})"
@@ -13817,6 +13797,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 ""
 
@@ -13844,9 +13824,9 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
-msgstr ""
-"Mangler obligatoriske attributter for element ''bounds''. Har "
-"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 ""
+"Mangler obligatoriske attributter for element ''bounds''. Har minlon=''{0}'',"
+"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
@@ -13887,6 +13867,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 "Ulovlig værdi af attribut ''ref'' på medlem i relation {0}. Fik {1}"
 
@@ -14327,6 +14306,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 ""
 
@@ -14536,6 +14515,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 ""
 
@@ -14602,5 +14580,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"
@@ -14685,6 +14663,6 @@
 msgid ""
 "<html>Uploading to the server <strong>failed</strong> because your "
-"current<br>dataset violates a precondition.<br>The error message "
-"is:<br>{0}</html>"
+"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
+"html>"
 msgstr ""
 "<html>Upload til serveren <strong>fejlede</strong> fordi dit nuværende "
@@ -14694,7 +14672,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 ""
 
@@ -14702,7 +14680,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 ""
 
@@ -14710,8 +14688,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 ""
 
@@ -14731,7 +14709,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 ""
 
@@ -14796,7 +14774,7 @@
 "problem with transferring data.<br>Details(untranslated): {1}</html>"
 msgstr ""
-"<html>Kunne ikke hverken uploade eller downloade data "
-"til/fra<br>''{0}''<br>på grund af et problem med at overføre "
-"data.<br>Detaljer(uoversatte): {1}</html>"
+"<html>Kunne ikke hverken uploade eller downloade data til/"
+"fra<br>''{0}''<br>på grund af et problem med at overføre data.<br>Detaljer"
+"(uoversatte): {1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:336
@@ -14810,7 +14788,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 ""
 
@@ -14822,7 +14799,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 ""
 "Det område du prøvede at downloade er for stort eller din anmodning var for "
@@ -14864,11 +14841,11 @@
 "<html>The server reports that an object is deleted.<br><strong>Uploading "
 "failed</strong> if you tried to update or delete this object.<br> "
-"<strong>Downloading failed</strong> if you tried to download this "
-"object.<br><br>The error message is:<br>{0}</html>"
+"<strong>Downloading failed</strong> if you tried to download this object."
+"<br><br>The error message is:<br>{0}</html>"
 msgstr ""
 "<html>Serveren rapporterer at et objekt er slettet.<br><strong>Upload "
 "fejlede</strong> hvis du prøvede at opdatere eller slette dette objekt.<br> "
-"<strong>Download fejlede</strong> hvis du prøvede at downloade dette "
-"objekt.<br><br>Fejlmeddelelsen er: <br>{0}</html>"
+"<strong>Download fejlede</strong> hvis du prøvede at downloade dette objekt."
+"<br><br>Fejlmeddelelsen er: <br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/I18n.java:439
@@ -15384,6 +15361,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>"
@@ -15410,6 +15387,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"
@@ -15447,6 +15424,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"
@@ -15462,7 +15439,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"
@@ -15513,9 +15490,29 @@
 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 "Bygninger"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#, fuzzy
+msgid "Rotate crosshair"
+msgstr "Roter med uret"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#, fuzzy
+msgid "Advanced settings"
+msgstr "Konfigurér avancerede indstillinger"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#, fuzzy
+msgid "Building tag:"
+msgstr "Bygning"
+
+#: ../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"
@@ -15524,35 +15521,45 @@
 #: ../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 "Offentlig bygning"
+
+#: ../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
+#, fuzzy
+msgid "Advanced..."
+msgstr "Avanceret"
+
+#: ../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 ""
 
@@ -15729,7 +15736,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--waterway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15739,5 +15746,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15747,5 +15754,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15761,5 +15768,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15769,5 +15776,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15775,8 +15782,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 "vand"
@@ -15798,5 +15805,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15805,5 +15812,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15812,5 +15819,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15819,5 +15826,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15826,5 +15833,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15833,10 +15840,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 "adresse"
@@ -15865,11 +15872,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 ""
 
@@ -16306,6 +16312,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 "Tomt lag"
@@ -16491,4 +16497,52 @@
 msgstr "Intet GPX-datalag blev fundet"
 
+#: ../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 "Ret zoo"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#, fuzzy
+msgid "Name:"
+msgstr "Navn"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#, fuzzy
+msgid "CmdLine:"
+msgstr "Koordinater:"
+
+#: ../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
+#, fuzzy, java-format
+msgid "Delete tool \"{0}\"?"
+msgstr "Slet punkt {0}"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:74
+msgid "Are you sure?"
+msgstr "Er du sikker?"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
+#, fuzzy
+msgid "New tool..."
+msgstr "Ny rolle"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
+#, fuzzy
+msgid "Install"
+msgstr "Industri"
+
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
 msgid "Position only"
@@ -16755,5 +16809,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#. 
+#.
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16874,6 +16928,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 ""
 "Maksimalt antal segmenter tillladt for hver genereret vej. Standard er 250."
@@ -16895,7 +16948,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 ""
 
@@ -17180,7 +17232,7 @@
 "new server? (Strongly recommended)</html>"
 msgstr ""
-"<html>OpenstreetBugs udvidelsen bruger den gamle server på "
-"appspot.com.<br>En ny server er tilgængelig på schokokeks.org.<br>Ønsker du "
-"at skifte til den nye server? (Anbefales stærkt)</html>"
+"<html>OpenstreetBugs udvidelsen bruger den gamle server på appspot.com."
+"<br>En ny server er tilgængelig på schokokeks.org.<br>Ønsker du at skifte "
+"til den nye server? (Anbefales stærkt)</html>"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:109
@@ -17207,6 +17259,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 ""
 
@@ -17318,6 +17369,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 ""
 
@@ -17370,6 +17420,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 ""
 
@@ -17661,6 +17710,5 @@
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
-msgstr ""
-"En udvidelse, som tillader JOSM at blive styret fra andre programmer."
+msgstr "En udvidelse, som tillader JOSM at blive styret fra andre programmer."
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
@@ -17737,5 +17785,5 @@
 msgstr "Tilbagefør"
 
-#: ../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}"
@@ -17786,4 +17834,41 @@
 msgid "Revert changeset #{0}"
 msgstr ""
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:78
+#, fuzzy
+msgid "Road Sign Plugin"
+msgstr "Henter udvidelser"
+
+#: ../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 "Kunne ikke læse kilde med fordefinerede tags: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
+#, fuzzy, java-format
+msgid "Error parsing tagging preset from ''{0}'':\n"
+msgstr "Indlæser stilkilder fra ''{0}''"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:104
+#, fuzzy, java-format
+msgid "Sign {0}"
+msgstr "Markering: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:111
+#, fuzzy, java-format
+msgid "Additional sign {0}"
+msgstr "Tilføj relation {0}"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -17890,4 +17975,15 @@
 msgstr "Indtast vægtede værdier"
 
+#: ../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 "Forenkl vej"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
+#, fuzzy
+msgid "Delete unnecessary nodes from an area."
+msgstr "Slet unødige punkter fra en vej."
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
 msgid "Slippy Map"
@@ -18683,6 +18779,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 ""
 
@@ -18768,8 +18864,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 ""
 
@@ -18823,8 +18919,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 ""
 
@@ -18936,6 +19032,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 ""
 
@@ -18943,6 +19039,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 ""
 
@@ -19610,11 +19706,9 @@
 #: ../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."
-msgstr ""
-"Stavekontrollens (se "
-"http://wiki.openstreetmap.org/index.php/User:JLS/speller) kilder (URL eller "
-"filnavn) eller tagtjekkerdatafiler."
+"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
+"org/index.php/User:JLS/speller) or tag checking data files."
+msgstr ""
+"Stavekontrollens (se http://wiki.openstreetmap.org/index.php/User:JLS/"
+"speller) kilder (URL eller filnavn) eller tagtjekkerdatafiler."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
@@ -19810,9 +19904,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 "område"
@@ -19854,6 +19948,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:38
 msgid "This test checks for untagged nodes that are not part of any way."
-msgstr ""
-"Denne test tjekker for utaggede punkter, som ikke er del af nogen vej."
+msgstr "Denne test tjekker for utaggede punkter, som ikke er del af nogen vej."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:60
@@ -19912,11 +20005,147 @@
 msgstr "{0}, ..."
 
-#: ../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
+#, fuzzy, java-format
+msgid "{0} {1}% of GPS track"
+msgstr "{0} består af {1} spor"
+
+#: ../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 "Importér lyd"
+
+#: ../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 "Fjern"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
+#, fuzzy
+msgid "removes current video from layer"
+msgstr "Fjern foto fra lag"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
+#, fuzzy
+msgid "play/pause"
+msgstr "Afspil/pause"
+
+#: ../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 "baggrund"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
+#, fuzzy
+msgid "jumps n sec back"
+msgstr "Hop tilbage."
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "forward"
+msgstr "Fremad"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "jumps n sec forward"
+msgstr "Hop fremad"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
+#, fuzzy
+msgid "faster"
+msgstr "Hurtigere"
+
+#: ../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 "Langsommere"
+
+#: ../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 "Tillad tilføjelse af markører/punkter på de nuværende gps-positioner."
+
+#. 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
+#, fuzzy
+msgid "Jump length"
+msgstr "Hop dertil"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#, fuzzy
+msgid "Set the length of a jump"
+msgstr "Indstil sproget"
+
+#: ../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
+#, fuzzy
+msgid "Loop length"
+msgstr "Længde"
+
+#: ../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 "lag"
+
+#: ../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 ""
 
@@ -20147,29 +20376,28 @@
 "Dette kan føre til forkerte koordinater."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
 msgid "Automatic downloading"
 msgstr "Automatisk download"
 
-#: ../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 ""
-"Advarsel: WMS-lag deaktiveret på grund af misformet basal URL \"{0}\""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:105
+msgstr "Advarsel: WMS-lag deaktiveret på grund af misformet basal URL \"{0}\""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
 msgid "(deactivated)"
 msgstr "(deaktiveret)"
 
-#: ../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 "WMS-lag ({0}) downloader automatisk i zoom {1}"
 
-#: ../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 "WMS-lag ({0}) downloader i zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
 #, java-format
 msgid ""
@@ -20184,17 +20412,17 @@
 "hente WMS-tern alligevel?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Yes, fetch images"
 msgstr "Ja hent billeder"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Invalid URL?"
 msgstr "Ugyldig URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311
 msgid "Download visible tiles"
 msgstr "Download synlige tern"
 
-#: ../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"
@@ -20203,96 +20431,96 @@
 "opløsningen."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329
 msgid "Change resolution"
 msgstr "Skift opløsning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341
 msgid "Reload erroneous tiles"
 msgstr "Genhent fejlagtige tern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365
 msgid "Alpha channel"
 msgstr "Alpha-kanal"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385
 msgid "Save WMS layer to file"
 msgstr "Gem WMS-lag til fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
 msgid "Save WMS layer"
 msgstr "Gem WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413
 msgid "Load WMS layer from file"
 msgstr "Indlæs WMS-lag fra fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
 msgid "Load WMS layer"
 msgstr "Indlæs WMS-lag"
 
-#: ../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 "WMS-filversion ikke understøttet; fandt {0}, forventede {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
 msgid "File Format Error"
 msgstr "Fil format fejl"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449
 msgid "Error loading file"
 msgstr "Fejl ved indlæsning af fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463
 msgid "Set WMS Bookmark"
 msgstr "Sæt WMS-bogmærke"
 
-#: ../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 "Åbn et tomt WMS-lag at indlæse data til fra en fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
 msgid "WMS Plugin Preferences"
 msgstr "Indstillinger for WMS-udvidelse"
 
-#: ../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 "Redigér listen over WMS-servere, som vises i WMS-udvidelsesmenuen"
 
-#: ../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 "Navn på menu"
 
-#: ../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 "WMS-URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "Menu Name (Default)"
 msgstr "Navn på menu (standard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "WMS URL (Default)"
 msgstr "WMS-URL (standard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:86
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
 msgid "Enter a menu name and WMS URL"
 msgstr "Angiv et menunavn og en WMS URL"
 
-#: ../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 "Vælg mindst en række at kopiere."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
 msgid "Downloader:"
 msgstr "Downloader:"
@@ -20309,4 +20537,8 @@
 msgid "% of north:"
 msgstr "% af nord:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186
+msgid "Simultaneous connections"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -20318,7 +20550,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
@@ -20371,8 +20603,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 "skov"
@@ -20389,7 +20621,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--boundary tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -20399,5 +20631,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -20440,5 +20672,5 @@
 #. color boundary
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -20448,5 +20680,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -20456,5 +20688,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -20464,15 +20696,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 "grænse"
@@ -20488,5 +20720,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -20495,7 +20727,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--route tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -20505,5 +20737,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -20513,5 +20745,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -20521,5 +20753,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -20529,5 +20761,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -20537,5 +20769,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -20545,5 +20777,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -20553,12 +20785,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 "rute"
@@ -20844,22 +21076,21 @@
 
 #. 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 ""
 "Download GPS-punkter direkte ind i JOSM fra Globalsat dg100-datalogger."
 
 #. 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 "Stil et baggrundslag til rådighed, der viser et kortnet"
 
 #. 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 "
@@ -20872,10 +21103,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:34
 msgid "Helps vectorizing WMS images."
 msgstr "Hjælper med at vektorisere WMS-billeder."
 
 #. 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."
@@ -20885,5 +21116,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 "
@@ -20896,15 +21127,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 "
@@ -20915,5 +21146,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 "
@@ -20923,15 +21154,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:48
 msgid "Displays an OpenLayers background image"
 msgstr "Viser et OpenLayers baggrundsbillede"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:50
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importerer sager fra OpenStreetBugs"
 
 #. 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"
@@ -20940,5 +21171,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."
@@ -20947,5 +21178,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 "
@@ -20954,5 +21185,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 "
@@ -20963,10 +21194,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."
@@ -20974,15 +21205,16 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "Let other applications send commands to JOSM."
 msgstr "Tillad andre applikationer at sende kommandoer til JOSM."
 
 #. 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 "
@@ -20993,10 +21225,17 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:71
 msgid "Provides routing capabilities."
 msgstr "Tilføjer ruteplan-egenskaber"
 
+#. 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 "
@@ -21007,16 +21246,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:77
 msgid "Allow adding markers/nodes on current gps positions."
-msgstr ""
-"Tillad tilføjelse af markører/punkter på de nuværende gps-positioner."
+msgstr "Tillad tilføjelse af markører/punkter på de nuværende gps-positioner."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:79
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Stiller en dialog til redigering af tags i tabelform til rådighed"
 
 #. 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 "
@@ -21029,10 +21267,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:83
 msgid "Make terraced houses out of single blocks."
 msgstr "Laver rækkehuse ud af en enkelt blok."
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:85
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21041,5 +21279,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) "
@@ -21048,5 +21286,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:89
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21055,10 +21293,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 "
@@ -21069,5 +21307,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 "
@@ -21077,5 +21315,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:97
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21086,15 +21324,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:99
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Nem download langs et langt sæt af indbyrdes forbundne veje"
 
 #. 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 "
@@ -21103,9 +21341,8 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:105
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
-msgstr ""
-"Vis georefererede billeder i JOSMs baggrund (WMS-servere, Yahoo, ...)."
+msgstr "Vis georefererede billeder i JOSMs baggrund (WMS-servere, Yahoo, ...)."
 
 #. <!--
@@ -21992,10 +22229,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 "rundkørsel"
@@ -22132,8 +22369,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"/>
@@ -22343,5 +22580,5 @@
 #. color motorroad
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -22351,5 +22588,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -22368,5 +22605,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -22376,5 +22613,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -22393,5 +22630,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -22401,5 +22638,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -22418,5 +22655,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -22426,5 +22663,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -22439,5 +22676,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -22455,8 +22692,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 "beboelse"
@@ -22471,5 +22708,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -22478,5 +22715,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--public_transport tags -->
 #. <rule>
@@ -22486,10 +22723,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 "service"
@@ -22504,5 +22741,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -22511,5 +22748,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -22519,10 +22756,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 "konstruktion"
@@ -23528,9 +23765,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 "marsk"
@@ -23860,5 +24097,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -23868,5 +24105,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -23876,5 +24113,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -23884,5 +24121,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -23892,5 +24129,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -23900,5 +24137,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -23908,5 +24145,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -23917,5 +24154,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -23923,9 +24160,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 "bane"
@@ -25335,5 +25572,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -25343,5 +25580,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -25351,5 +25588,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -25359,5 +25596,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -25721,7 +25958,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--sport tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -25731,5 +25968,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -25739,5 +25976,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -25747,5 +25984,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -25755,5 +25992,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -25763,5 +26000,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -25771,5 +26008,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -25779,5 +26016,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -25787,5 +26024,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -25795,5 +26032,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -25803,5 +26040,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -25811,5 +26048,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -25819,5 +26056,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -25827,5 +26064,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -25835,5 +26072,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -25843,5 +26080,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -25851,5 +26088,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -25859,5 +26096,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -25867,5 +26104,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -25875,5 +26112,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -25883,5 +26120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -25891,5 +26128,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -25899,5 +26136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -25907,5 +26144,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -25915,5 +26152,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -25923,5 +26160,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -25931,5 +26168,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -25939,5 +26176,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -25947,5 +26184,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -25955,5 +26192,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -25963,5 +26200,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -25971,5 +26208,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -25979,5 +26216,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -25987,5 +26224,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -25995,5 +26232,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -26003,5 +26240,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -26011,5 +26248,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -26019,5 +26256,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -26027,5 +26264,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -26035,5 +26272,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -26043,5 +26280,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -26051,5 +26288,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -26059,5 +26296,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -26067,5 +26304,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -26075,5 +26312,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -26083,5 +26320,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -26091,33 +26328,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 "sport"
@@ -27795,7 +28032,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--landuse tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -27805,5 +28042,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -27813,5 +28050,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -27821,5 +28058,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -27829,5 +28066,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -27837,5 +28074,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -27845,5 +28082,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -27853,5 +28090,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -27861,12 +28098,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 "grøn"
@@ -29282,5 +29519,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -29296,5 +29533,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -29304,18 +29541,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 -->
@@ -29324,7 +29578,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- cycleway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -29334,5 +29588,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -29342,5 +29596,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -29350,5 +29604,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -29358,12 +29612,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 "cykel"
@@ -29390,5 +29645,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -29404,5 +29659,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -29412,5 +29667,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -29419,13 +29674,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"/>
@@ -29436,11 +29699,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 "fod"
@@ -29459,8 +29723,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 "undergrundsbane"
@@ -29572,9 +29836,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
@@ -29582,5 +29846,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,
@@ -29590,8 +29854,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
@@ -29605,5 +29869,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#. 
+#.
 #: build/trans_style.java:72
 msgid "standard"
@@ -29611,5 +29875,5 @@
 
 #. mappaint style named "standard"
-#. 
+#.
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -29658,6 +29922,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>
@@ -29737,5 +30001,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -29745,16 +30009,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 ""
@@ -29765,5 +30029,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -29772,5 +30036,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -29779,5 +30043,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -29793,5 +30057,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -29805,5 +30069,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -29812,5 +30076,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -29819,5 +30083,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -29826,5 +30090,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -29833,5 +30097,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -29840,5 +30104,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -29847,5 +30111,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxweight"/>
@@ -29854,5 +30118,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxheight"/>
@@ -29861,5 +30125,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -29868,5 +30132,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxlength"/>
@@ -29875,5 +30139,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -29882,5 +30146,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="minspeed"/>
@@ -29889,5 +30153,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxstay"/>
@@ -29896,5 +30160,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="toll"/>
@@ -29903,5 +30167,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="barrier"/>
@@ -30078,7 +30342,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- highway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -30092,5 +30356,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -30100,7 +30364,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- tracktype tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -30110,5 +30374,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -30118,5 +30382,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -30126,5 +30390,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -30134,10 +30398,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 ""
@@ -30148,5 +30412,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -30155,5 +30419,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -30163,5 +30427,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -30170,5 +30434,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -30177,5 +30441,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -30184,5 +30448,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -30191,5 +30455,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -30198,5 +30462,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -30205,5 +30469,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -30212,5 +30476,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -30219,5 +30483,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -30226,8 +30490,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 "services"
@@ -30238,8 +30502,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 ""
@@ -30250,5 +30514,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -30257,8 +30521,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 ""
@@ -30269,9 +30533,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 ""
@@ -30282,9 +30546,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 "flodbred"
@@ -30295,8 +30559,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 "bæk"
@@ -30307,8 +30571,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 "havn"
@@ -30319,5 +30583,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -30326,5 +30590,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -30333,5 +30597,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -30341,5 +30605,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -30348,5 +30612,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -30355,5 +30619,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -30362,5 +30626,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -30370,5 +30634,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -30379,5 +30643,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -30387,7 +30651,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--man_made tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -30397,5 +30661,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -30405,5 +30669,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -30413,5 +30677,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -30422,5 +30686,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -30429,5 +30693,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -30437,5 +30701,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -30445,5 +30709,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -30453,5 +30717,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -30461,5 +30725,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -30469,5 +30733,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -30477,5 +30741,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -30485,5 +30749,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -30493,5 +30757,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -30501,18 +30765,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 "menneskeskabt"
@@ -30522,9 +30786,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 ""
@@ -30535,7 +30799,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- railway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -30545,5 +30809,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -30552,5 +30816,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -30560,5 +30824,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -30567,5 +30831,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -30575,5 +30839,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -30583,10 +30847,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 ""
@@ -30597,5 +30861,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -30606,13 +30870,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 ""
@@ -30623,5 +30887,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -30631,5 +30895,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30642,5 +30906,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30648,7 +30912,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 ""
@@ -30659,5 +30923,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -30666,5 +30930,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -30673,5 +30937,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -30680,7 +30944,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aeroway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -30691,9 +30955,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 ""
@@ -30704,8 +30968,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 "terminal"
@@ -30716,5 +30980,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -30724,8 +30988,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 ""
@@ -30736,8 +31000,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 ""
@@ -30748,5 +31012,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -30755,5 +31019,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -30762,7 +31026,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aerialway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -30772,5 +31036,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -30780,5 +31044,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -30788,5 +31052,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -30796,5 +31060,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -30804,10 +31068,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 ""
@@ -30818,11 +31082,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 ""
@@ -30833,9 +31097,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 ""
@@ -30846,9 +31110,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 ""
@@ -30859,9 +31123,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 ""
@@ -30872,9 +31136,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 ""
@@ -30885,9 +31149,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 ""
@@ -30898,7 +31162,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--power tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -30908,5 +31172,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -30915,5 +31179,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -30923,5 +31187,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -30931,5 +31195,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -30939,5 +31203,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -30947,5 +31211,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -30955,5 +31219,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -30963,5 +31227,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -30971,5 +31235,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -30979,5 +31243,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -30987,5 +31251,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -30995,5 +31259,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -31003,15 +31267,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 "kraft"
@@ -31021,9 +31285,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 "mole"
@@ -31034,8 +31298,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 "rørledning"
@@ -31045,7 +31309,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--leisure tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -31055,5 +31319,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -31063,5 +31327,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -31071,5 +31335,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -31079,5 +31343,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -31087,5 +31351,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -31095,5 +31359,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -31103,5 +31367,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -31111,5 +31375,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -31119,5 +31383,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -31127,5 +31391,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -31135,5 +31399,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -31143,5 +31407,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -31151,5 +31415,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -31159,5 +31423,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -31167,5 +31431,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -31175,17 +31439,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 "rekreation"
@@ -31195,9 +31459,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 "marina"
@@ -31207,7 +31471,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--amenity tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -31217,5 +31481,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -31225,5 +31489,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -31233,5 +31497,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -31241,5 +31505,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -31249,5 +31513,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -31257,5 +31521,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -31265,5 +31529,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -31273,5 +31537,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -31281,5 +31545,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -31289,14 +31553,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 ""
@@ -31306,5 +31570,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -31314,5 +31578,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -31322,5 +31586,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -31330,5 +31594,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -31338,5 +31602,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -31346,5 +31610,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -31354,5 +31618,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -31362,5 +31626,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -31370,5 +31634,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -31378,5 +31642,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -31386,5 +31650,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -31394,14 +31658,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 ""
@@ -31411,5 +31675,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -31418,5 +31682,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -31426,5 +31690,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -31433,5 +31697,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -31441,5 +31705,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -31449,5 +31713,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -31457,5 +31721,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -31464,5 +31728,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -31472,5 +31736,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -31480,5 +31744,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -31488,5 +31752,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -31496,5 +31760,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -31503,5 +31767,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -31510,5 +31774,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -31517,5 +31781,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -31524,5 +31788,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -31531,5 +31795,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -31538,5 +31802,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -31545,5 +31809,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -31552,5 +31816,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -31559,5 +31823,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -31566,5 +31830,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -31573,5 +31837,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -31580,5 +31844,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -31587,5 +31851,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -31595,5 +31859,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -31603,5 +31867,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -31611,5 +31875,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -31619,5 +31883,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -31627,5 +31891,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -31635,5 +31899,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -31643,5 +31907,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -31651,5 +31915,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -31659,5 +31923,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -31668,5 +31932,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -31676,5 +31940,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -31684,5 +31948,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -31692,5 +31956,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -31700,5 +31964,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -31708,5 +31972,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -31716,5 +31980,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -31724,5 +31988,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -31732,5 +31996,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -31740,5 +32004,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -31748,5 +32012,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -31756,5 +32020,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -31764,5 +32028,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -31772,5 +32036,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -31780,5 +32044,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -31788,5 +32052,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"/>
@@ -31796,5 +32068,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -31804,5 +32076,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -31812,5 +32084,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -31820,5 +32092,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -31827,27 +32099,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 ""
@@ -31857,5 +32130,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -31865,5 +32138,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -31873,12 +32146,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 ""
@@ -31888,5 +32161,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -31896,5 +32169,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -31904,5 +32177,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -31912,5 +32185,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -31920,5 +32193,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -31928,5 +32201,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -31936,11 +32209,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 "helbred"
@@ -31950,7 +32223,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--shop tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -31960,5 +32233,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -31968,5 +32241,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -31976,5 +32249,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -31984,5 +32257,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -31992,5 +32265,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -32000,5 +32273,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -32008,5 +32281,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -32016,5 +32289,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -32024,5 +32297,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -32032,5 +32305,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -32040,5 +32313,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -32048,5 +32321,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -32056,5 +32329,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -32064,5 +32337,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -32072,5 +32345,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -32080,5 +32353,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -32088,5 +32361,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -32096,5 +32369,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -32104,5 +32377,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -32112,5 +32385,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -32120,5 +32393,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -32128,5 +32401,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -32136,5 +32409,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -32144,5 +32417,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -32152,5 +32425,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -32160,5 +32433,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -32168,5 +32441,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -32176,5 +32449,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -32184,5 +32457,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -32192,5 +32465,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -32200,5 +32473,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -32208,5 +32481,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -32216,5 +32489,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -32224,5 +32497,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -32232,5 +32505,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -32240,5 +32513,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -32248,5 +32521,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -32256,5 +32529,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -32264,5 +32537,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -32272,5 +32545,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -32280,5 +32553,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -32288,31 +32561,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 "butik"
@@ -32322,7 +32595,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--tourism tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -32332,5 +32605,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -32340,5 +32613,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -32348,5 +32621,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -32356,5 +32629,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -32364,5 +32637,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -32372,5 +32645,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -32380,12 +32653,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 "hotel"
@@ -32395,5 +32668,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -32403,5 +32676,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -32411,5 +32684,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -32419,5 +32692,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -32427,5 +32700,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -32435,5 +32708,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -32444,5 +32717,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -32452,5 +32725,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- information tags -->
 #. <rule>
@@ -32460,5 +32733,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -32468,5 +32741,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -32475,5 +32748,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -32482,13 +32755,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 "turisme"
@@ -32498,7 +32771,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--historic tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -32508,5 +32781,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -32516,5 +32789,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -32524,5 +32797,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -32532,5 +32805,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -32540,5 +32813,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -32548,5 +32821,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -32556,5 +32829,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -32564,5 +32837,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -32572,13 +32845,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 "historisk"
@@ -32588,8 +32861,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 "stenbrud"
@@ -32600,8 +32873,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 "losseplads"
@@ -32612,5 +32885,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -32620,8 +32893,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 "basin"
@@ -32632,8 +32905,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 "gårdsplads"
@@ -32644,6 +32917,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
-#. 
+#.
+#.
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -32653,8 +32926,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 ""
@@ -32665,8 +32938,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 "industri"
@@ -32677,8 +32950,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 ""
@@ -32689,8 +32962,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 ""
@@ -32701,8 +32974,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 ""
@@ -32713,5 +32986,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -32721,7 +32994,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--military tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -32731,5 +33004,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -32739,5 +33012,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -32747,5 +33020,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -32755,11 +33028,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 "militær"
@@ -32770,8 +33043,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 "kirkegård"
@@ -32781,8 +33054,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 "top"
@@ -32793,9 +33066,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 "gletsjer"
@@ -32805,9 +33078,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 "vulkan"
@@ -32817,5 +33090,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -32826,5 +33099,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -32834,5 +33107,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -32842,5 +33115,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -32850,5 +33123,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -32858,12 +33131,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 ""
@@ -32873,9 +33146,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 "buskads"
@@ -32885,9 +33158,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 "hede"
@@ -32897,9 +33170,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 ""
@@ -32909,9 +33182,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 ""
@@ -32921,9 +33194,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 "strand"
@@ -32934,5 +33207,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?
@@ -32958,5 +33231,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -32967,11 +33240,11 @@
 #. </rule>
 #. -->
-#. 
+#.
 #. <!--name tags -->
-#. 
+#.
 #. <!--preferences tags -->
-#. 
+#.
 #. <!--place tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -32981,5 +33254,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -32989,5 +33262,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -32997,5 +33270,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -33005,5 +33278,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -33013,5 +33286,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -33021,5 +33294,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -33029,5 +33302,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -33037,5 +33310,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -33045,5 +33318,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -33053,5 +33326,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -33061,5 +33334,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -33069,15 +33342,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 "sted"
@@ -33087,9 +33360,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 ""
@@ -33180,5 +33453,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#. 
+#.
 #. Data type can be:
 #. node        - a node point
@@ -33186,28 +33459,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
@@ -33322,5 +33595,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#. 
+#.
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -33333,5 +33606,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>
@@ -33356,6 +33629,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#. 
-#. 
+#.
+#.
 #. only for Germany
 #: build/trans_wms.java:17
@@ -33364,6 +33637,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#. 
-#. 
+#.
+#.
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -33378,6 +33651,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
@@ -33391,6 +33664,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
@@ -33410,6 +33683,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#. 
-#. 
+#.
+#.
 #. only for Japan
 #: build/trans_wms.java:39
@@ -33433,6 +33706,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
@@ -33445,4 +33718,13 @@
 msgstr "Sicilen - Italien"
 
+#~ 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 ""
+#~ "Målobjekt med id {0} og version {1} er synlig selvom kildeobjekt med "
+#~ "lavere version {2} ikke er synlig. Kan ikke håndtere denne inkonsistens. "
+#~ "Beholder målobjekt. "
+
 #~ msgid "Move"
 #~ msgstr "Flyt"
@@ -33454,5 +33736,4 @@
 #~ msgstr "Vis ikke igen"
 
-#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Send venligst en fejlrapport på {0}"
@@ -33506,9 +33787,7 @@
 #~ msgstr "Overførsel er afbrudt grundet en fejl (venter i fem sekunder)"
 
-#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "Udvidelse kræver en JOSM-opdatering: {0}."
 
-#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Udvidelsen blev ikke fundet: {0}"
@@ -33563,5 +33842,4 @@
 #~ msgstr "navn"
 
-#, java-format
 #~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
 #~ msgstr "Kan ikke læse tidspunkt \"{0}\" for punkt {1} x {2}"
@@ -33570,13 +33848,10 @@
 #~ msgstr "Ingen billeder med læsbare tidsstempler fundet"
 
-#, java-format
 #~ msgid "GPS start: {0}"
 #~ msgstr "GPS-start: {0}"
 
-#, java-format
 #~ msgid "No time for point {0} x {1}"
 #~ msgstr "Intet tidspunkt for punkt {0} x {1}"
 
-#, java-format
 #~ msgid "Images for {0}"
 #~ msgstr "Billeder for {0}"
@@ -33591,5 +33866,4 @@
 #~ msgstr "Indtast den viste dato (mm/dd/åååå TT:MM:SS)"
 
-#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} inden for sporet."
@@ -33598,9 +33872,7 @@
 #~ msgstr "Synkronisér ur"
 
-#, java-format
 #~ msgid "The date in file \"{0}\" could not be parsed."
 #~ msgstr "Datoen i filen \"{0}\" kunne ikke forstås."
 
-#, java-format
 #~ msgid "There is no EXIF time within the file \"{0}\"."
 #~ msgstr "Der er intet EXIF-tidspunkt i filen \"{0}\"."
@@ -33638,5 +33910,4 @@
 #~ msgstr "Åbn fil (som rå GPS, hvis .gpx)"
 
-#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -33648,8 +33919,8 @@
 #~ " {0}"
 
-#, java-format
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
 #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "{0} udvidelse blev succesfuldt opdateret. Genstart venligst JOSM."
+#~ msgstr[0] ""
+#~ "{0} udvidelse blev succesfuldt opdateret. Genstart venligst JOSM."
 #~ msgstr[1] ""
 #~ "{0} udvidelser blev succesfuldt opdateret. Genstart venligst JOSM."
@@ -33664,5 +33935,4 @@
 #~ msgstr "udredet udgave:"
 
-#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -33676,9 +33946,7 @@
 #~ msgstr "Filen blev ikke fundet"
 
-#, java-format
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Kunne ikke hente udvidelsen {0} fra {1}"
 
-#, java-format
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Løs {0} konflikter i {1} objekter"
@@ -33702,5 +33970,4 @@
 #~ msgstr "Kan kun redigere hjælpesider fra JOSM Online-hjælp"
 
-#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Fejl ved indlæsning af siden {0}"
@@ -33716,6 +33983,6 @@
 
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want to "
-#~ "combine them?"
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
 #~ msgstr ""
 #~ "De valgte veje hører til forskellige relationer. Vil du stadigvæk "
@@ -33731,5 +33998,4 @@
 #~ msgstr "unavngivet"
 
-#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "Kontakt {0}..."
@@ -33767,7 +34033,4 @@
 #~ msgid "Validate either current selection or complete dataset."
 #~ msgstr "Validér enten den nuværende selektion eller det fulde datasæt"
-
-#~ msgid "Are you sure?"
-#~ msgstr "Er du sikker?"
 
 #~ msgid "Open images with AgPifoJ..."
@@ -33799,12 +34062,10 @@
 #~ "setting the config option 'pluginmanager.warntime'.)"
 #~ msgstr ""
-#~ "(Du kan rette antallet af dage mellem denne advarsel vises<br>ved at rette i "
-#~ "indstillingen 'pluginmanager.warntime'.)"
-
-#, java-format
+#~ "(Du kan rette antallet af dage mellem denne advarsel vises<br>ved at "
+#~ "rette i indstillingen 'pluginmanager.warntime'.)"
+
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "Brug forudindstilling \"{0}\" af gruppe \"{1}\""
 
-#, java-format
 #~ msgid "Use preset ''{0}''"
 #~ msgstr "Brug forudindstilling \"{0}\""
@@ -33820,6 +34081,6 @@
 
 #~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before reporting "
-#~ "a bug."
+#~ "Try updating to the newest version of JOSM and all plugins before "
+#~ "reporting a bug."
 #~ msgstr ""
 #~ "Prøv at opdatere til nyeste udgave af JOSM og alle udvidelser, før du "
@@ -33847,5 +34108,4 @@
 #~ msgstr "GPS-enhedens tidszone (forskel fra foto)"
 
-#, java-format
 #~ msgid "GPS end: {0}"
 #~ msgstr "GPS-slut: {0}"
@@ -33872,7 +34132,7 @@
 #~ msgstr "Modstridende relation"
 
-#, 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 "Udvidelsen {0} forekommer itu eller kunne ikke hentes automatisk."
 
@@ -33955,25 +34215,19 @@
 #~ msgstr "Vælg mindst én opgave til download"
 
-#, java-format
 #~ msgid "Way ''{0}'' with less than two points."
 #~ msgstr "Vej \"{0}\" med mindre end to punkter."
 
-#, java-format
 #~ msgid "No outer way for multipolygon ''{0}''."
 #~ msgstr "Ingen ydre vej for multipolygon \"{0}\"."
 
-#, java-format
 #~ msgid "Error: {0}"
 #~ msgstr "Fejl: {0}"
 
-#, java-format
 #~ msgid "Warning: {0}"
 #~ msgstr "Advarsel: {0}"
 
-#, java-format
 #~ msgid "multipolygon way ''{0}'' is not closed."
 #~ msgstr "multipolygon-vej \"{0}\" er ikke lukket."
 
-#, java-format
 #~ msgid "No useful role ''{0}'' for Way ''{1}''."
 #~ msgstr "Ingen brugbar rolle \"{0}\" for vej \"{1}\"."
@@ -33991,9 +34245,7 @@
 #~ msgstr "Vælg venligst en bruger fra forfatter-panelet"
 
-#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "Forfattere: {0}"
 
-#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Kommando-stak: {0}"
@@ -34008,5 +34260,4 @@
 #~ msgstr "Synkronisér tidspunkt med GPS-enhed"
 
-#, java-format
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr ""
@@ -34016,5 +34267,4 @@
 #~ msgstr "Tip: Nogle ændringer kom ved afsendingen af nyt data til serveren"
 
-#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -34023,6 +34273,6 @@
 #~ "{0}"
 #~ msgstr ""
-#~ "Arkivet over udvidelser er allerede tilgængeligt. Vil du hente den nuværende "
-#~ "version ved at slette det eksisterende arkiv?\n"
+#~ "Arkivet over udvidelser er allerede tilgængeligt. Vil du hente den "
+#~ "nuværende version ved at slette det eksisterende arkiv?\n"
 #~ "\n"
 #~ "{0}"
@@ -34047,10 +34297,10 @@
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version selected "
-#~ "in the history list."
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
 #~ msgstr ""
-#~ "Returnér alle valgte objekter til den version, der er valgt i historiklisten."
-
-#, java-format
+#~ "Returnér alle valgte objekter til den version, der er valgt i "
+#~ "historiklisten."
+
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Relations-editor: {0}"
@@ -34059,5 +34309,4 @@
 #~ msgstr "Login"
 
-#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Kan ikke åbne mappen for indstillinger: {0}"
@@ -34066,9 +34315,7 @@
 #~ msgstr "Slet og hent"
 
-#, java-format
 #~ msgid "Unknown member type for ''{0}''."
 #~ msgstr "Ukendt medlemstype for \"{0}\"."
 
-#, java-format
 #~ msgid "Unknown role ''{0}''."
 #~ msgstr "Ukendt rolle \"{0}\"."
@@ -34077,9 +34324,7 @@
 #~ msgstr "Hent valgte"
 
-#, java-format
 #~ msgid "Parsing error in URL: \"{0}\""
 #~ msgstr "Fortolkningsfejl i URL: \"{0}\""
 
-#, java-format
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "Kunne ikke læse fra URL: \"{0}\""
@@ -34091,5 +34336,4 @@
 #~ msgstr "Kun to punkter er tilladt."
 
-#, java-format
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
@@ -34119,5 +34363,4 @@
 #~ msgstr "Standardværdier"
 
-#, java-format
 #~ msgid "Offset between track and photos: {0}m {1}s"
 #~ msgstr "Forskydning mellem spor og billeder: {0}m {1}s"
@@ -34166,6 +34409,6 @@
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still want "
-#~ "to merge them?"
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
 #~ msgstr ""
 #~ "De valgte punkter tilhører forskellige relationer. Vil du stadigvæk "
@@ -34176,14 +34419,13 @@
 #~ "elements have a history."
 #~ msgstr ""
-#~ "Vælg mindst ét punkt, vej eller relation. Kun allerede uploadede elementer "
-#~ "har en historik."
-
-#, java-format
+#~ "Vælg mindst ét punkt, vej eller relation. Kun allerede uploadede "
+#~ "elementer har en historik."
+
 #~ msgid "Non-Way ''{0}'' in multipolygon."
 #~ msgstr "Ikke-vej \"{0}\" i multipolygon."
 
 #~ msgid ""
-#~ "Several utilities that make your life easier: e.g. simplify way, join areas, "
-#~ "jump to position."
+#~ "Several utilities that make your life easier: e.g. simplify way, join "
+#~ "areas, jump to position."
 #~ msgstr ""
 #~ "Adskillige funktioner, der gør dit arbejde lettere: Fx forenkl vej, "
@@ -34194,6 +34436,6 @@
 
 #~ msgid ""
-#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
-#~ "these will then show up in the WMS menu.\n"
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
 #~ "\n"
 #~ "You can also do this manually in the Advanced Preferences, using the "
@@ -34210,6 +34452,6 @@
 #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
 #~ "only need to input the relevant 'id'.\n"
-#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in "
-#~ "this example,replacing 73 with your image id: \n"
+#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
+#~ "in this example,replacing 73 with your image id: \n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -34232,29 +34474,32 @@
 #~ "format=image/jpeg \n"
 #~ "\n"
-#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/  skal du "
-#~ "kun bruge det relevante 'id' som input..\n"
-#~ "Vil du tilføje et Metacarta Map Rectifier-menupunkt manuelt, opret da en URL "
-#~ "manuelt som i dette eksempel, hvor du erstatter 63 med dit billede-id: \n"
+#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/  skal "
+#~ "du kun bruge det relevante 'id' som input..\n"
+#~ "Vil du tilføje et Metacarta Map Rectifier-menupunkt manuelt, opret da en "
+#~ "URL manuelt som i dette eksempel, hvor du erstatter 63 med dit billede-"
+#~ "id: \n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
 #~ " \n"
 #~ "Bemærk: Vær sikker på at billedet er hensigtsmæssigt at bruge ud fra "
-#~ "ophavsretsmæssige betragtninger. Er du i tvivl, så undlad at bruge billedet."
+#~ "ophavsretsmæssige betragtninger. Er du i tvivl, så undlad at bruge "
+#~ "billedet."
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data layer?"
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
 #~ msgstr ""
-#~ "Intet data til opdatering. Har du allerede åbnet eller downloadet et datalag?"
-
-#, java-format
+#~ "Intet data til opdatering. Har du allerede åbnet eller downloadet et "
+#~ "datalag?"
+
 #~ msgid "current delta: {0}s"
 #~ msgstr "nuværende forskel: {0}s"
 
 #~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this as "
-#~ "a bug."
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
 #~ msgstr ""
-#~ "Intern fejl: kan ikke tjekke omstændighederne for manglende lag. Rapportér "
-#~ "venligst dette som en fejl."
+#~ "Intern fejl: kan ikke tjekke omstændighederne for manglende lag. "
+#~ "Rapportér venligst dette som en fejl."
 
 #~ msgid "More than one \"to\" way found."
@@ -34276,9 +34521,7 @@
 #~ msgstr "Intet \"via\"-punkt eller vej blev fundet."
 
-#, java-format
 #~ msgid "Intersection between ways ''{0}'' and ''{1}''."
 #~ msgstr "Overlap mellem vejene \"{0}\" og \"{1}\"."
 
-#, java-format
 #~ msgid "Inner way ''{0}'' is outside."
 #~ msgstr "Indre vej \"{0}\" er på ydersiden."
@@ -34314,5 +34557,4 @@
 #~ msgstr "Flere detaljer"
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -34328,5 +34570,4 @@
 #~ "Upload ikke noget data efter denne besked."
 
-#, java-format
 #~ msgid "Change the projection to {0} first."
 #~ msgstr "Skift først projiceringen til {0}."
@@ -34335,5 +34576,4 @@
 #~ msgstr "Ugyldig projicering"
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -34350,5 +34590,4 @@
 #~ "Upload ikke noget data efter denne besked."
 
-#, java-format
 #~ msgid "Checking whether node {0} is gone ..."
 #~ msgstr "Tjekker om punktet {0} er væk ..."
@@ -34357,5 +34596,4 @@
 #~ msgstr "Gendanner relation..."
 
-#, java-format
 #~ msgid "Checking whether primitive {0} is gone ..."
 #~ msgstr "Tjekker om primitiven {0} er væk ..."
@@ -34406,5 +34644,4 @@
 #~ msgstr "Versionsnummer mangler fra OSM-data."
 
-#, java-format
 #~ msgid "Plugin {0} requires JOSM update to version {1}."
 #~ msgstr "Udvidelsen {0} kræver at JOSM skal opdateres til version {1}."
@@ -34417,6 +34654,6 @@
 #~ "import EXIF geotagged pictures."
 #~ msgstr ""
-#~ "Endnu en geotag-udvidelse for JOSM. Sammeholder billeder med GPS-spor samt "
-#~ "importerer EXIF-geotaggede billeder."
+#~ "Endnu en geotag-udvidelse for JOSM. Sammeholder billeder med GPS-spor "
+#~ "samt importerer EXIF-geotaggede billeder."
 
 #~ msgid "Directly load TCX files from JOSM."
@@ -34426,11 +34663,10 @@
 #~ msgstr "Kunne ikke opstarte API'et. Prøv igen senere."
 
-#, java-format
 #~ msgid ""
 #~ "Current number of changes exceeds the max. number of changes, current is "
 #~ "{0}, max is {1}"
 #~ msgstr ""
-#~ "Det nuværende antal ændringer overskrider det maksimale antal; nuværende er "
-#~ "{0}, maksimum er {1}"
+#~ "Det nuværende antal ændringer overskrider det maksimale antal; nuværende "
+#~ "er {0}, maksimum er {1}"
 
 #~ msgid "No data"
@@ -34443,5 +34679,4 @@
 #~ msgstr "Hent tilknytninger fra OSM..."
 
-#, java-format
 #~ msgid ""
 #~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
@@ -34453,12 +34688,10 @@
 #~ "Der er ugemte ændringer i {0} lag. Smid ændringerne væk og fortsæt?"
 
-#, java-format
 #~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr "Hjælpesiden mangler. Opret den på <a href=\"{0}\">engelsk</a>"
 
-#, java-format
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
 #~ msgstr ""
 #~ "Hjælpesiden mangler. Opret den på <a href=\"{0}\">engelsk</a> eller <a "
@@ -34472,11 +34705,10 @@
 
 #~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
 #~ msgstr ""
 #~ "Hjælpesiden mangler. Opret den på <a href=\"{0}\"engelsk</a>. eller i <a "
 #~ "href=\"{1}\">dit eget sprog</a>."
 
-#, java-format
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "uventet svar. Modtog {0}"
@@ -34485,17 +34717,14 @@
 #~ msgstr "Der er ingen primitiver med versionen {0} i denne historik"
 
-#, java-format
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Kunne ikke læse \"{0}\""
 
-#, java-format
 #~ msgid ""
 #~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
 #~ "resolve them first.</html>"
 #~ msgstr ""
-#~ "<html>Der er uløste konflikter i lag ''{0}''.<br>Du er nødt til at løse dem "
-#~ "først.</html>"
-
-#, java-format
+#~ "<html>Der er uløste konflikter i lag ''{0}''.<br>Du er nødt til at løse "
+#~ "dem først.</html>"
+
 #~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 #~ msgstr "Forventede instans af OsmDataLayer eller GpxLayer. Fik ''{0}''."
@@ -34513,28 +34742,24 @@
 #~ "Er du virkelig sikker på at du vil fortsætte?"
 
-#, java-format
 #~ msgid ""
 #~ "<html>There are {0} primitives in your local dataset which<br>might be "
 #~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
-#~ "to check the state of these primitives<br>on the server.<br>Click "
+#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
+#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
 #~ "<strong>{2}</strong> to ignore.<br></html>"
 #~ msgstr ""
 #~ "<html>There are {0} primitiver i dit lokale datasæt, som<br>risikerer at "
 #~ "blive slettet på serveren. Hvis du senere forsøger at slette "
-#~ "eller<br>opdatere dem, rapporterer serveren sandsynligvis "
-#~ "en<br>konflikt.<br><br>Klik <strong>{1}</strong> for at tjekke disse "
-#~ "primitivers status<br>på serveren.<br>Klik <strong>{2}</strong> for at "
-#~ "ignorere.<br></html>"
-
-#, java-format
+#~ "eller<br>opdatere dem, rapporterer serveren sandsynligvis en<br>konflikt."
+#~ "<br><br>Klik <strong>{1}</strong> for at tjekke disse primitivers "
+#~ "status<br>på serveren.<br>Klik <strong>{2}</strong> for at ignorere.<br></"
+#~ "html>"
+
 #~ msgid "Incorrect value of version operator: {0}. Number is expected."
 #~ msgstr "Ukorrekt værdi af versions-operatør: {0}. Tal forventes."
 
-#, java-format
 #~ msgid "Incorrect value of id operator: {0}. Number is expected."
 #~ msgstr "Ukorrekt værdi af id-operatør: {0}. Tal forventes."
 
-#, java-format
 #~ msgid "Incorrect value of changeset operator: {0}. Number is expected."
 #~ msgstr "Ukorrekt værdi af rettesæts-operatør: {0}. Tal forventes."
@@ -34543,5 +34768,4 @@
 #~ msgstr "Mindst et objekt at slette krævet. Har tom samling."
 
-#, java-format
 #~ msgid "Parameter ''{0}'' must not be empty"
 #~ msgstr "Parameter ''{0}'' må ikke være tom"
@@ -34551,5 +34775,4 @@
 #~ "Opret markører der ikke har noget med lyd at gøre, når der læses GPX-data."
 
-#, java-format
 #~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
 #~ msgstr "Mønster-syntaks-fejl: Mønster {0} i {1} er ulovlig!"
@@ -34558,8 +34781,7 @@
 #~ msgstr "Forkert antal parametre for tags operatør"
 
-#, java-format
 #~ msgid ""
-#~ "Incorrect value of tags operator: {0}. Tags operator expects number of tags "
-#~ "or range, for example tags:1 or tags:2-5"
+#~ "Incorrect value of tags operator: {0}. Tags operator expects number of "
+#~ "tags or range, for example tags:1 or tags:2-5"
 #~ msgstr ""
 #~ "Ukorrekt værdi af tags operatør: {0}. Tags operatøren forventer antal af "
@@ -34569,5 +34791,4 @@
 #~ msgstr "Forkert antal parametre for punkt operatør."
 
-#, java-format
 #~ msgid ""
 #~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
@@ -34577,17 +34798,13 @@
 #~ "punkter eller et interval, for eksempel punkter:10-20"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
 #~ msgstr "Parameter ''{0}'' > 0.0 forventet, fik {1}"
 
-#, java-format
 #~ msgid "Illegal double value ''{0}''"
 #~ msgstr "Ulovlig double værdi {0}"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' >= 0 expected, got {1}"
 #~ msgstr "Parameter \"{0}\" >= 0 forventet. Fik {1}."
 
-#, java-format
 #~ msgid "Expected ID >= 0. Got {0}."
 #~ msgstr "Forventet ID >= 0. Fik {0}."
@@ -34596,17 +34813,13 @@
 #~ msgstr "Gauss-Laborde Réunion 1947"
 
-#, java-format
 #~ msgid "Style for inner way ''{0}'' equals multipolygon."
 #~ msgstr "Stil for indre vej \"{0}\" er lig med multipolygon."
 
-#, java-format
 #~ msgid "Style for outer way ''{0}'' mismatches."
 #~ msgstr "Stil for ydre vej \"{0}\" passer ikke sammen."
 
-#, java-format
 #~ msgid "Style for restriction {0} not found."
 #~ msgstr "Stil for restriktion {0} ikke fundet."
 
-#, java-format
 #~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
 #~ msgstr "Parameter \"{0}\" > 0 forventet. Fik {1}."
@@ -34615,5 +34828,4 @@
 #~ msgstr "Bekræftelse"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' must not be empty."
 #~ msgstr "Parameter ''{0}'' må ikke være tom."
@@ -34623,5 +34835,4 @@
 #~ msgstr "Lukket"
 
-#, java-format
 #~ msgid "Uploading {0} objects ..."
 #~ msgstr "Uploader {0} objekter ..."
@@ -34637,6 +34848,6 @@
 
 #~ msgid ""
-#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
-#~ "the following\n"
+#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to "
+#~ "add the following\n"
 #~ "      Java option to increase the maximum size of allocated memory"
 #~ msgstr ""
@@ -34645,9 +34856,7 @@
 #~ "      Java option for at øge den tildelte hukommelses maksimumstørrelse."
 
-#, java-format
 #~ msgid "Parameter current out of range. Got {0}."
 #~ msgstr "Parameter ude af intervalområde. Fik {0}."
 
-#, java-format
 #~ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 #~ msgstr "Parameter \"{0}\" med tags for præcist en nøgle forventet. Fik {1}."
@@ -34659,5 +34868,4 @@
 #~ msgstr "Dialog ikke oprettet endnu. Start createInstance() først"
 
-#, java-format
 #~ msgid "Expected integer value > 0 for parameter ''{0}'', got ''{1}''"
 #~ msgstr "Forventede heltalsværdi > 0 for parameter ''{0}''. Fik ''{1}''"
@@ -34670,34 +34878,28 @@
 #~ "include all changesets in the query.</html>"
 #~ msgstr ""
-#~ "<html>Markér for at begrænse forespørgslen til kun dine "
-#~ "rettesæt.<br>Afmarkér for at inkludere alle rettesæt i forespørgslen.</html>"
-
-#, java-format
+#~ "<html>Markér for at begrænse forespørgslen til kun dine rettesæt."
+#~ "<br>Afmarkér for at inkludere alle rettesæt i forespørgslen.</html>"
+
 #~ msgid ""
-#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal to "
-#~ "deleting the roles of these primitives.<br>Do you really want to apply the "
-#~ "new role?</html>"
+#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
+#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
+#~ "the new role?</html>"
 #~ msgstr ""
 #~ "<html>Du giver {0} primitiver en tom rolle.<br>Dette svarer til at slette "
-#~ "disse primitivers roller.<br>Ønsker du virkelig at anvende den nye "
-#~ "rolle?</html>"
-
-#, java-format
+#~ "disse primitivers roller.<br>Ønsker du virkelig at anvende den nye rolle?"
+#~ "</html>"
+
 #~ msgid "Value of child.getId() > 0 expected. Got {1}."
 #~ msgstr "Værdi af child.getId() > 0 forventet. Fik {1}."
 
-#, java-format
 #~ msgid "Parameter ''{0}'' must not be null."
 #~ msgstr "parameteren ''{0}'' må ikke være en null-værdi"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' > 0 expected. Got {1}."
 #~ msgstr "Parameter ''{0}'' > 0 forventet. Fik {1}"
 
-#, java-format
 #~ msgid "Object id > 0 expected. Got {0}"
 #~ msgstr "Objekt-ID > 0 forventet. Fik {0}"
 
-#, java-format
 #~ msgid "id in parameter ''{0}'' > 0 expected, got {1}."
 #~ msgstr "ID i parameter ''{0}'' > 0 forventet. Fik {1}."
@@ -34713,11 +34915,11 @@
 
 #~ msgid ""
-#~ "You are about to delete nodes outside of the area you have "
-#~ "downloaded.<br>This can cause problems because other objects (that you don't "
-#~ "see) might use them.<br>Do you really want to delete?"
+#~ "You are about to delete nodes outside of the area you have downloaded."
+#~ "<br>This can cause problems because other objects (that you don't see) "
+#~ "might use them.<br>Do you really want to delete?"
 #~ msgstr ""
-#~ "Du er ved at slette punkter uden for det område du har downloadet.<br>Dette "
-#~ "kan medføre problemer, fordi andre objekter (som du ikke kan se) måske "
-#~ "bruger dem.<br>Ønsker du virkelig at slette?"
+#~ "Du er ved at slette punkter uden for det område du har downloadet."
+#~ "<br>Dette kan medføre problemer, fordi andre objekter (som du ikke kan "
+#~ "se) måske bruger dem.<br>Ønsker du virkelig at slette?"
 
 #~ msgid "Errors during Download"
@@ -34727,5 +34929,4 @@
 #~ msgstr "Download område"
 
-#, java-format
 #~ msgid "{0} Plugin successfully downloaded."
 #~ msgid_plural "{0} Plugins successfully downloaded."
@@ -34733,5 +34934,4 @@
 #~ msgstr[1] "{0} Udvidelse problemfrit downloadet."
 
-#, java-format
 #~ msgid "Downloaded plugin information from {0} site"
 #~ msgid_plural "Downloaded plugin information from {0} sites"
@@ -34745,10 +34945,9 @@
 #~ msgstr " (<a href=\"urn:changeset-configuration\">konfigurér rettesæt</a>)"
 
-#, java-format
 #~ msgid ""
 #~ "Click ''<strong>{0}</strong>'' to continue uploading to additional new "
 #~ "changsets.<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>"
+#~ "dialog.<br>Click ''<strong>{2}</strong>'' to abort uploading and return "
+#~ "to map editing.<br>"
 #~ msgstr ""
 #~ "Klik ''<strong>{0}</strong>'' for at fortsætte upload til flere nye "
@@ -34757,13 +34956,12 @@
 #~ "tilbage til kortredigering.<br>"
 
-#, java-format
 #~ msgid ""
 #~ "The server reported that the current changset was closed.<br>This is most "
-#~ "likely because the changesets size exceeded the max. size<br>of {0} objects "
-#~ "on the server ''{1}''."
+#~ "likely because the changesets size exceeded the max. size<br>of {0} "
+#~ "objects on the server ''{1}''."
 #~ msgstr ""
 #~ "Serveren rapporterede at det nuværende rettesæt blev lukket.<br>Dette "
-#~ "skyldes højst sandsynligt at rettesættets størrelse overskred de maksimale "
-#~ "{0} objekter på serveren ''{1}''."
+#~ "skyldes højst sandsynligt at rettesættets størrelse overskred de "
+#~ "maksimale {0} objekter på serveren ''{1}''."
 
 #~ msgid ""
@@ -34773,16 +34971,18 @@
 #~ msgstr ""
 #~ "<b>Zoom:</b> Musehjul, dobbeltklik eller Ctrl + op/ned.<b>Flyt kort:</b> "
-#~ "Hold højre museknap og flyt musen eller brug piletaster. <b>Markér:</b> Hold "
-#~ "venstre museknap og træk en ramme."
+#~ "Hold højre museknap og flyt musen eller brug piletaster. <b>Markér:</b> "
+#~ "Hold venstre museknap og træk en ramme."
 
 #~ msgid "Area style way is not closed."
 #~ msgstr "Vej omkring område er ikke lukket."
 
-#, java-format
-#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
+#~ msgid ""
+#~ "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them all?"
+#~ "The selection contains {0} ways. Are you sure you want to simplify them "
+#~ "all?"
 #~ msgstr[0] ""
-#~ "Markeringen indeholder {0} vej. Er du sikker på at du ønsker at forenkle den?"
+#~ "Markeringen indeholder {0} vej. Er du sikker på at du ønsker at forenkle "
+#~ "den?"
 #~ msgstr[1] ""
 #~ "Markeringen indeholder {0} veje. Er du sikker på at du ønsker at forenkle "
@@ -34790,5 +34990,6 @@
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you load\n"
+#~ "Parameters are read in the order they are specified, so make sure you "
+#~ "load\n"
 #~ "some data before --selection"
 #~ msgstr ""
@@ -34803,5 +35004,4 @@
 #~ msgstr "<flere>"
 
-#, java-format
 #~ msgid "Delete old plugin file {0}"
 #~ msgstr "Slet gammel udvidelsesfil {0}"
@@ -34811,8 +35011,7 @@
 #~ "Udvidelsen kunne ikke fjernes. Den er sandsynligvis allerede slået fra"
 
-#, java-format
 #~ msgid ""
-#~ "Warning: Failed to retrieve user infos for the current JOSM user. Exceptions "
-#~ "was: {0}"
+#~ "Warning: Failed to retrieve user infos for the current JOSM user. "
+#~ "Exceptions was: {0}"
 #~ msgstr ""
 #~ "Advarsel: Kunne ikke hente brugerinfo for den nuværende JOSM bruger. "
@@ -34823,91 +35022,72 @@
 
 #~ 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 ""
-#~ "Aktivering af de opdaterede udvidelser fejlede. Tjek om JOSM har tilladelse "
-#~ "til at overskrive de eksisterende udvidelser."
-
-#, java-format
+#~ "Aktivering af de opdaterede udvidelser fejlede. Tjek om JOSM har "
+#~ "tilladelse til at overskrive de eksisterende udvidelser."
+
 #~ msgid "Plug-in named {0} is not available. Update skipped."
 #~ msgstr "Udvidelsen {0} er ikke tilgængelig. Opdatering sprunget over."
 
-#, java-format
 #~ msgid ""
-#~ "<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-#~ "network problem, please check your<br>your internet connection</html>"
+#~ "<html>Failed to open help page for url {0}.<br>This is most likely due to "
+#~ "a network problem, please check your<br>your internet connection</html>"
 #~ msgstr ""
-#~ "<html>Kunne ikke åbne hjælp-side for URL {0}.<br>Dette skyldes sandsynligvis "
-#~ "et netværksproblem. Tjek venligst din<br> internetforbindelse.</html>"
-
-#, java-format
+#~ "<html>Kunne ikke åbne hjælp-side for URL {0}.<br>Dette skyldes "
+#~ "sandsynligvis et netværksproblem. Tjek venligst din<br> "
+#~ "internetforbindelse.</html>"
+
 #~ msgid "Expected array of length 4, got {0}"
 #~ msgstr "Forventede array med længden 4. Fik {0}"
 
-#, java-format
 #~ msgid "Exactly four doubles excpected in string, got {0}"
 #~ msgstr "Præcist fire doubles forventet i streng. Fik {0}."
 
-#, java-format
 #~ msgid "Id > 0 required, got {0}"
 #~ msgstr "Id > 0 påkrævet. Fik {0}."
 
-#, java-format
 #~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
 #~ msgstr "Parameteren ''{0}'' > 0 forventet. Fik {1}."
 
-#, java-format
 #~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 #~ msgstr "Parameter \"{0}\" i intervallet 0..{1} forventedes. Fik {2}"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
 #~ msgstr "Parameteren \"{0}\" er ikke et gyldigt typenavn. Fik {1}."
 
-#, java-format
 #~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 #~ msgstr "Parameteren \"{0}\" er ikke en acceptabel klasse. Fik {1}."
 
-#, java-format
 #~ msgid "Unexpected column index. Got {0}."
 #~ msgstr "Uventet kolonne-indeks. Fik {0}"
 
-#, java-format
 #~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
 #~ msgstr "Parameteren 'col' skal være 0 eller 1. Fik {0}"
 
-#, java-format
 #~ msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 #~ msgstr "Ulovlig værdi af attribut ''UID''. Fik ''{0}''."
 
-#, java-format
 #~ msgid "Expected instance of OsmDataLayer. Got ''{0}''."
 #~ msgstr "Forventede instans af OsmDataLayer. Fik ''{0}''."
 
-#, java-format
 #~ msgid "Expected value of type integer > 0 for parameter ''{0}'', got {1}"
 #~ msgstr "Forventet værdi af type heltal > 0 for parameter ''{0}'', Fik {1}"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 #~ msgstr "Parameter ''{0}'' >= 0 forventet. Fik ''{1}''."
 
-#, java-format
 #~ msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 #~ msgstr "ID parameter ''{0}'' > 0 forventet. Fik ''{1}''."
 
-#, java-format
 #~ msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}"
 #~ msgstr "Forventede værdi af type long > 0 for parameter ''{0}''. Fik {1}."
 
-#, java-format
 #~ msgid "Parameter ''{0}'' of type node expected, got ''{1}''"
 #~ msgstr "Parameter ''{0}'' af type node forventet. Fik ''{1}''"
 
-#, java-format
 #~ msgid "Expected value > 0 for parameter ''{0}'', got {1}"
 #~ msgstr "Forventet værdi > 0 for parameter ''{0}''. Fik {1}."
 
-#, java-format
 #~ msgid "Expected unique id > 0 for primitive id, got {0}"
 #~ msgstr "Forventede unik ID > 0 for primitiv-ID. Fik {0}."
Index: /applications/editors/josm/i18n/po/de.po
===================================================================
--- /applications/editors/josm/i18n/po/de.po	(revision 21970)
+++ /applications/editors/josm/i18n/po/de.po	(revision 21971)
@@ -8,6 +8,6 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-15 18:25+0200\n"
-"PO-Revision-Date: 2010-06-15 16:14+0000\n"
+"POT-Creation-Date: 2010-06-23 22:47+0200\n"
+"PO-Revision-Date: 2010-06-15 17:49+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: <de@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-06-15 16:23+0000\n"
+"X-Launchpad-Export-Date: 2010-06-23 20:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -23,5 +23,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
@@ -93,5 +93,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
@@ -253,5 +253,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
@@ -274,5 +274,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
@@ -280,6 +280,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
@@ -288,4 +290,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
@@ -412,4 +416,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
@@ -449,5 +454,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 "Information"
@@ -661,5 +666,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
@@ -674,5 +679,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 "Entfernen"
@@ -921,4 +926,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 ""
@@ -931,4 +937,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 "Dies kann dazu führen, dass Knoten aus Versehen gelöscht werden."
@@ -1503,6 +1510,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
@@ -1529,4 +1536,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
@@ -1535,6 +1544,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 "Fehler"
@@ -1685,8 +1694,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 "Ja, Knoten löschen"
 
 #: ../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 "Knoten ausserhalb von Ladebereichen löschen"
@@ -1695,5 +1706,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 "Nein, abbrechen"
@@ -1701,16 +1713,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 "Operation abbrechen"
 
 #: ../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 "Wollen Sie sie trotzdem löschen?"
 
 #: ../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 "Knoten außerhalb von Ladebereichen löschen?"
 
 #: ../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 "Bitte mindestens einen Weg zum Vereinfachen auswählen."
@@ -1719,13 +1736,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 "Ja"
 
 #: ../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 "Alle ausgewählten Wege vereinfachen"
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:126
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:89
 #, java-format
 msgid ""
@@ -1734,8 +1754,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 "Wege vereinfachen?"
 
 #: ../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"
@@ -1745,4 +1767,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)"
@@ -2043,5 +2066,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 "Keine Änderungen zum Hochladen vorhanden."
@@ -2059,14 +2081,14 @@
 msgstr "Alle Änderungen in der aktuellen Auswahl zum OSM-Server hochladen."
 
-#: ../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 "Elternobjekte auf gelöschte Objekten prüfen."
 
-#: ../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 "Eltern von ''{0}'' lesen"
 
-#: ../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 "Im lokalen Datensatz auf gelöschte Elternobjekte prüfen"
@@ -2337,5 +2359,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
@@ -3017,10 +3039,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
@@ -3146,5 +3172,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
@@ -3278,11 +3304,11 @@
 msgstr[1] "{0} Knoten bewegen"
 
-#: ../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 "Das Objekt ''{0}'' wurde entfernt"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111
 #, java-format
 msgid "Purged {0} object"
@@ -3291,5 +3317,5 @@
 msgstr[1] "{0} Objekte wurden entfernt"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 #, java-format
 msgid ""
@@ -3300,5 +3326,5 @@
 "aber min. 2 Knoten benötigt."
 
-#: ../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}"
@@ -3682,4 +3708,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}"
@@ -3694,5 +3723,6 @@
 "gefunden"
 
-#: ../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}"
@@ -3701,5 +3731,7 @@
 "gefunden"
 
-#: ../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}"
@@ -3708,6 +3740,8 @@
 "nicht gefunden"
 
-#: ../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}"
@@ -3715,18 +3749,4 @@
 "Beim Zusammenführen wurde das Ziel-Objekt vom Type {0} für das Objekt mit ID "
 "{1} nicht gefunden"
-
-#. 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 ""
-"Zielobjekt mit der ID {0} und Version {1} ist sichtbar obwohl das "
-"Quellobjekt mit der niedrigeren Version {2} nicht sichtbar ist. Diese "
-"Inkonsistenz konnte nicht gelöst werden. Zielobjekt beibehalten. "
 
 #. translators notes must be in front
@@ -3804,19 +3824,19 @@
 msgstr "</p><p>Den Filterdialog schließen, um alle Objekte zu sehen<p></html>"
 
-#: ../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 "Ein Objekt mit ID=0 darf nicht unsichtbar sein."
 
-#: ../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 "ID >= 0 erwartet, jedoch {0} erhalten."
 
-#: ../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 "Version > 0 erwartet, jedoch {0} erhalten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:795
 #, java-format
 msgid ""
@@ -3827,5 +3847,5 @@
 "Änderungssatz-Nummer ist {0}"
 
-#: ../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 "
@@ -3833,5 +3853,5 @@
 msgstr "Zusammenfügen nicht möglich, weil neue und alte Objekte enthalten sind"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1169
 #, java-format
 msgid ""
@@ -3908,5 +3928,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 "Ausgewählt"
@@ -4197,5 +4217,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 "Gebäude"
@@ -4282,5 +4302,5 @@
 msgstr "Objekt gelöscht"
 
-#: ../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
@@ -4518,5 +4538,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
@@ -4525,4 +4545,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
@@ -4732,5 +4753,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
@@ -5434,10 +5455,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"
@@ -5446,10 +5469,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
@@ -5531,4 +5556,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 "Kein"
@@ -5845,5 +5871,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
@@ -5950,5 +5976,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
@@ -5956,5 +5982,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 "Hinzufügen"
@@ -6003,5 +6029,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 "Versionsprotokoll"
@@ -6223,10 +6249,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 "In Relationsliste auswählen"
 
 #: ../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 "Relation in Relationsliste auswählen."
@@ -7890,9 +7916,9 @@
 msgstr "Dieser URL ist keine gültige Änderungssatzanfrage."
 
-#: ../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 "Eigenschaften hinzufügen"
 
-#: ../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."
@@ -7901,23 +7927,23 @@
 msgstr[1] "Damit werden maximal {0} Objekte geändert."
 
-#: ../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 "Ein leerer Wert löscht den Schlüssel."
 
-#: ../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 "<unterschiedlich>"
 
-#: ../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 "Werte ändern?"
 
-#: ../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"
@@ -7926,5 +7952,5 @@
 msgstr[1] "Ändere Eigenschaften für bis zu {0} Objekte"
 
-#: ../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."
@@ -7933,77 +7959,77 @@
 msgstr[1] "Damit werden maximal {0} Objekte geändert."
 
-#: ../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 "Bitte wählen Sie einen Schlüssel"
 
-#: ../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 "Bitte wählen Sie einen Wert"
 
-#: ../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 "Bitte wählen Sie die Objekte, deren Eigenschaften Sie ändern wollen."
 
-#: ../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 "Eigenschaften/Mitgliedschaften"
 
-#: ../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 "Eigenschaften der ausgewählten Objekte."
 
 #. 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 "Element von"
 
-#: ../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 "Position"
 
-#: ../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 "Eigenschaften: {0} / Mitgliedschaften: {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 "Eigenschaften / Mitgliedschaften"
 
-#: ../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 "Relation ändern"
 
-#: ../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 "Aus der Relation entfernen"
 
-#: ../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 "Auswahl wirklich aus Relation {0} entfernen?"
 
-#: ../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 "Den gewählten Schlüssel von allen Objekten entfernen"
 
-#: ../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 "Eigenschaften entfernen"
 
-#: ../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 "Neues Paar aus Schlüssel und Wert zu allen Objekten hinzufügen"
 
-#: ../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 "Den Wert des Schlüssels für alle Objekte bearbeiten"
 
-#: ../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 "Relation auswählen"
 
-#: ../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 "Relation in Hauptauswahl übernehmen."
@@ -9434,5 +9460,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 "Nein"
@@ -9984,5 +10010,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..."
@@ -11838,5 +11864,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 "Bitte wählen Sie die zu löschende Zeile."
@@ -12353,5 +12379,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 "Voreinstellungen laden"
@@ -12856,5 +12882,5 @@
 "Der Eintrag ist ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #, java-format
 msgid ""
@@ -12866,10 +12892,10 @@
 
 #. 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 "Objektvorlagenquelle konnte nicht gelesen werden {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
 #, java-format
 msgid ""
@@ -12882,5 +12908,5 @@
 "[{1}:{2}] {3}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
 #, java-format
 msgid ""
@@ -12892,5 +12918,5 @@
 "table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
 #, java-format
 msgid ""
@@ -12902,5 +12928,5 @@
 "</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:101
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
 #, java-format
 msgid ""
@@ -12912,9 +12938,9 @@
 "html>"
 
-#: ../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 "Objektvorlagenmenü sortieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
 msgid "Tagging Presets"
 msgstr "Objektvorlagen"
@@ -13413,4 +13439,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 "Einstellungen ändern"
@@ -13621,5 +13648,5 @@
 msgstr "Server-Antwort wird verarbeitet..."
 
-#: ../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}''"
@@ -13913,10 +13940,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 "Unerwartetes Format der ID vom Server erhalten. Wert ist \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:278
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -13926,65 +13953,65 @@
 "\"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
 msgid "Creating changeset..."
 msgstr "Änderungssatz erstellen..."
 
-#: ../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 "Änderungssatz {0} erfolgreich geöffnet"
 
-#: ../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 "Nummer > 0 für den Änderungssatz erwartet. Wert {0} erhalten."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349
 msgid "Updating changeset..."
 msgstr "Änderungssatz aktualisieren..."
 
-#: ../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 "Änderungssatz {0} aktualisieren..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:388
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389
 msgid "Closing changeset..."
 msgstr "Änderungssatz schließen..."
 
-#: ../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 "Kein Änderungssatz zum Hochladen vorhanden"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
 msgid "Preparing upload request..."
 msgstr "Hochladeanfrage vorbereiten..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447
 msgid "Waiting 10 seconds ... "
 msgstr "Warte 10 Sekunden... "
 
-#: ../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 "Starte Versuch {0} von {1} in {2} Sekunden..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:458
 msgid "OK - trying again."
 msgstr "OK - erneuter Versuch."
 
-#: ../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 "Starte Wiederholung {0} von {1}."
 
-#: ../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 ""
 "Der aktuelle Änderungsdatensatz ist ungültig. Kann keine Daten hochladen."
 
-#: ../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}."
@@ -13993,5 +14020,5 @@
 "ist {0}."
 
-#: ../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}."
@@ -14194,4 +14221,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})"
@@ -16138,10 +16166,30 @@
 msgstr "Hausnummern:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:134
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#, fuzzy
+msgid "Big buildings mode"
+msgstr "Größe des Gebäudes festlegen"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#, fuzzy
+msgid "Rotate crosshair"
+msgstr "Nach rechts drehen"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#, fuzzy
+msgid "Advanced settings"
+msgstr "Erweiterte Einstellungen konfigurieren"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#, fuzzy
+msgid "Building tag:"
+msgstr "Gebäude"
+
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:234
 msgid "Cannot place building outside of the world."
 msgstr ""
 "Das Gebäude kann nicht außerhalb der Kartenbegrenzung positioniert werden."
 
-#: ../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"
@@ -16150,35 +16198,48 @@
 #: ../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 "Größe des Gebäudes festlegen"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:24
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
 msgid "Use Address dialog"
 msgstr "Adressdialog nutzen"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#, fuzzy
+msgid "Auto-select building"
+msgstr "Erstelle ein Gebäude"
+
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
 msgid "Buildings width:"
 msgstr "Breite des Gebäudes:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Length step:"
 msgstr "Schrittweite:"
 
-#: ../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
+#, fuzzy
+msgid "Advanced..."
+msgstr "Erweitert"
+
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:65
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 msgid "Draw buildings"
 msgstr "Gebäude zeichnen"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
-msgid "Point on the corner of building to start drawing"
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:379
+#, fuzzy
+msgid "Point on the corner of the building to start drawing"
 msgstr "Auf Gebäudeecke zeigen, um zu beginnen"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:304
-msgid "Point on opposite end of building"
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:381
+#, fuzzy
+msgid "Point on opposite end of the building"
 msgstr "Auf gegenüberliegendes Ende des Gebäudes zeigen"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
-msgid "Set width of building"
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:383
+#, fuzzy
+msgid "Set width of the building"
 msgstr "Breite des Gebäudes festlegen"
 
@@ -16416,8 +16477,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 "Wasser"
@@ -16478,6 +16539,6 @@
 #. <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 "Adresse"
@@ -16978,6 +17039,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 "Leere Ebene"
@@ -17167,4 +17228,52 @@
 msgid "No GPX data layer found."
 msgstr "Keine GPX-Datenebene gefunden."
+
+#: ../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 "Zoo bearbeiten"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#, fuzzy
+msgid "Name:"
+msgstr "Name"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#, fuzzy
+msgid "CmdLine:"
+msgstr "Koordinaten:"
+
+#: ../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
+#, fuzzy, java-format
+msgid "Delete tool \"{0}\"?"
+msgstr "Knoten {0} löschen"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:74
+msgid "Are you sure?"
+msgstr ""
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
+#, fuzzy
+msgid "New tool..."
+msgstr "Neue Rolle"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
+#, fuzzy
+msgid "Install"
+msgstr "Industrie"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
@@ -18440,5 +18549,5 @@
 msgstr "Rückgängig"
 
-#: ../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}"
@@ -18493,4 +18602,41 @@
 msgid "Revert changeset #{0}"
 msgstr "Änderungssatz {0} umkehren"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:78
+#, fuzzy
+msgid "Road Sign Plugin"
+msgstr "Plugins laden"
+
+#: ../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 "Quelle für Objektvorlage konnte nicht gelesen werden: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
+#, fuzzy, java-format
+msgid "Error parsing tagging preset from ''{0}'':\n"
+msgstr "Lese Plugin-Liste von Quelle ''{0}'' ein"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:104
+#, fuzzy, java-format
+msgid "Sign {0}"
+msgstr "Auswahl: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:111
+#, fuzzy, java-format
+msgid "Additional sign {0}"
+msgstr "Relation {0} hinzufügen"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -18596,4 +18742,15 @@
 msgid "Enter weight values"
 msgstr "Gewichtswerte eingeben"
+
+#: ../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 "Weg vereinfachen"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
+#, fuzzy
+msgid "Delete unnecessary nodes from an area."
+msgstr "Unnötige Knoten eines Weges löschen."
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
@@ -20610,5 +20767,5 @@
 #. <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 "Fläche"
@@ -20710,12 +20867,149 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:86
-#, java-format
-msgid "{0} covers {1}% of GPS track"
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
+#, fuzzy, java-format
+msgid "{0} {1}% of GPS track"
 msgstr "{0} deckt {1}% der GPS-Spur ab"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:104
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
 msgstr "Zeigt die aktuelle Position im Video"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:113
+#, fuzzy
+msgid "Import Video"
+msgstr "Audio importieren"
+
+#: ../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 "Entfernen"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
+#, fuzzy
+msgid "removes current video from layer"
+msgstr "Photo aus Ebene entfernen"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
+#, fuzzy
+msgid "play/pause"
+msgstr "Abspielen / Pause"
+
+#: ../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 "Hintergrund"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
+#, fuzzy
+msgid "jumps n sec back"
+msgstr "Springe zurück."
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "forward"
+msgstr "Vorwärts"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "jumps n sec forward"
+msgstr "Springe vor"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
+#, fuzzy
+msgid "faster"
+msgstr "Schneller"
+
+#: ../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 "Langsamer"
+
+#: ../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 "Erlaubt Markierungen/Knoten an der aktuellen GPS-Position einzufügen."
+
+#. 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
+#, fuzzy
+msgid "Jump length"
+msgstr "Dorthin springen"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#, fuzzy
+msgid "Set the length of a jump"
+msgstr "Sprache einstellen"
+
+#: ../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
+#, fuzzy
+msgid "Loop length"
+msgstr "Länge"
+
+#: ../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
+#, fuzzy
+msgid "deinterlacing using linear interpolation"
+msgstr "Bildfilter  Interpolierung"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:99
+#, fuzzy
+msgid "play"
+msgstr "Ebene"
+
+#: ../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 ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -20955,9 +21249,9 @@
 "nicht identisch. Das kann zu falschen Koordinaten führen."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
 msgid "Automatic downloading"
 msgstr "Automatisches Laden"
 
-#: ../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}''"
@@ -20966,19 +21260,19 @@
 "ungültiges Format hat"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:105
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
 msgid "(deactivated)"
 msgstr "(deaktiviert)"
 
-#: ../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 "WMS-Ebene ({0}): Automatisches Laden mit Zoom {1}"
 
-#: ../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 "WMS-Ebene ({0}): Laden mit Zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
 #, java-format
 msgid ""
@@ -20993,17 +21287,17 @@
 "heruntergeladen werden?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Yes, fetch images"
 msgstr "Ja, Kacheln herunterladen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Invalid URL?"
 msgstr "Ungültige URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311
 msgid "Download visible tiles"
 msgstr "Sichtbare Kacheln laden"
 
-#: ../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"
@@ -21012,96 +21306,96 @@
 "die Auflösung"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329
 msgid "Change resolution"
 msgstr "Auflösung ändern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341
 msgid "Reload erroneous tiles"
 msgstr "Fehlerhafte Kacheln neu laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365
 msgid "Alpha channel"
 msgstr "Alphakanal"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385
 msgid "Save WMS layer to file"
 msgstr "WMS-Ebene in Datei speichern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
 msgid "Save WMS layer"
 msgstr "WMS-Ebene speichern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413
 msgid "Load WMS layer from file"
 msgstr "WMS-Ebene aus Datei laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
 msgid "Load WMS layer"
 msgstr "WMS-Ebene laden"
 
-#: ../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 "WMS-Datei-Version nicht unterstützt; gefunden {0}, erwartet {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
 msgid "File Format Error"
 msgstr "Dateiformatfehler"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449
 msgid "Error loading file"
 msgstr "Fehler beim Laden der Datei"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463
 msgid "Set WMS Bookmark"
 msgstr "WMS-Lesezeichen erstellen"
 
-#: ../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 "Eine leere WMS-Ebene öffnen, um Daten aus einer Datei zu laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
 msgid "WMS Plugin Preferences"
 msgstr "Einstellungen für WMS-Plugin"
 
-#: ../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 "Liste der WMS-Server ändern, die im WMS Plugin-Menü angezeigt werden"
 
-#: ../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 "Menüname"
 
-#: ../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 "WMS-URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "Menu Name (Default)"
 msgstr "Menüname (Standard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "WMS URL (Default)"
 msgstr "WMS-URL (Standard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:86
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
 msgid "Enter a menu name and WMS URL"
 msgstr "Bitte einen Bezeichner und einen WMS-URL eingeben"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:111
 msgid "Copy Selected Default(s)"
 msgstr "Ausgewählte Standardwerte kopieren"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
 msgid "Please select at least one row to copy."
 msgstr "Bitte wählen Sie mindestens eine Zeile, die kopiert werden soll."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
 msgid "Downloader:"
 msgstr "Herunterladeprogramm:"
@@ -21118,4 +21412,9 @@
 msgid "% of north:"
 msgstr "Nord-Süd (%):"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186
+#, fuzzy
+msgid "Simultaneous connections"
+msgstr "Knoten: Verbindung"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -21185,5 +21484,5 @@
 #. <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 "Forst"
@@ -21278,12 +21577,12 @@
 #. <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 "Grenze"
@@ -21367,9 +21666,9 @@
 #. <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 "Route"
@@ -21661,5 +21960,5 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:26
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
@@ -21667,15 +21966,15 @@
 
 #. Plugin graphview
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:28
 msgid "Visualizes routing information as a routing graph."
 msgstr "Visualisiert Routeninformationen als Routengraph."
 
 #. Plugin grid
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:30
 msgid "Provide a background layer that displays a map grid"
 msgstr "Erstellt eine Hintergrundebene, die ein Kartennetz anzeigt"
 
 #. 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 "
@@ -21688,10 +21987,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:34
 msgid "Helps vectorizing WMS images."
 msgstr "Hilfe beim Vektorisieren von WMS-Bildern."
 
 #. 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."
@@ -21701,5 +22000,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 "
@@ -21712,15 +22011,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 "Fügt Abbiegeverbote nach links für 4 oder 5 ausgewählte Wege hinzu"
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:42
 msgid "Simply convert an area to a multipolygon."
 msgstr "Ein Gebiet einfach in ein Multipolygon umwandeln."
 
 #. Plugin multipoly
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:44
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -21731,5 +22030,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 "
@@ -21742,15 +22041,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:48
 msgid "Displays an OpenLayers background image"
 msgstr "Zeigt ein OpenLayers-Hintergrundbild"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:50
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importiert Berichte von OpenStreetBugs"
 
 #. 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"
@@ -21760,5 +22059,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."
@@ -21767,5 +22066,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 "
@@ -21776,5 +22075,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 "
@@ -21785,10 +22084,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Das großartige Plastic-Design von JGoodies."
 
 #. 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."
@@ -21798,15 +22097,16 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "Let other applications send commands to JOSM."
 msgstr "Erlaubt anderen Programmen, Kommandos an JOSM zu senden."
 
 #. Plugin reverter
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid "Plugin for reverting changesets"
 msgstr "Plugin zum Umkehren von Änderungssätzen"
 
+#. 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 "
@@ -21817,10 +22117,17 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:71
 msgid "Provides routing capabilities."
 msgstr "Bietet Routenführungsmöglichkeiten."
 
+#. 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 "
@@ -21831,15 +22138,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:77
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Erlaubt Markierungen/Knoten an der aktuellen GPS-Position einzufügen."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:79
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Öffnet einen Dialog, um Merkmale in einer Tabelle zu bearbeiten."
 
 #. 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 "
@@ -21852,10 +22159,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:83
 msgid "Make terraced houses out of single blocks."
 msgstr "Erstellt Reihenhäuser aus einem Häuserblock."
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:85
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21866,5 +22173,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) "
@@ -21875,5 +22182,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:89
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21884,10 +22191,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:91
 msgid "Allows undeleting object from OSM database"
 msgstr "Erlaubt es Objekte der OSM-Datenbank wiederherzustellen"
 
 #. 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 "
@@ -21899,5 +22206,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 "
@@ -21910,5 +22217,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:97
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21920,15 +22227,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:99
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Leichtes Herunterladen entlang einer langen Reihe verbundener Wege"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:101
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Eine Reihe von nichtverzweigenden verbundenen Wegen auswählen"
 
 #. 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 "
@@ -21939,5 +22246,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:105
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22834,5 +23141,5 @@
 #. <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 "Kreisverkehr"
@@ -23295,5 +23602,5 @@
 #. <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 "Ortsstraße"
@@ -23328,5 +23635,5 @@
 #. <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 "Service"
@@ -23360,6 +23667,6 @@
 #. <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 "Baustelle"
@@ -24369,5 +24676,5 @@
 #. <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 "Marsch"
@@ -24760,9 +25067,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 "Eisenbahn"
@@ -26933,28 +27240,28 @@
 #: 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 "Sport"
@@ -28701,9 +29008,9 @@
 #. <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 "grün"
@@ -30142,8 +30449,16 @@
 #. </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>
@@ -30155,4 +30470,13 @@
 #. <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 -->
@@ -30200,7 +30524,8 @@
 #: 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 "Fahrrad"
@@ -30260,4 +30585,12 @@
 #. <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>
@@ -30278,6 +30611,7 @@
 #: 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 "Fuß"
@@ -30299,5 +30633,5 @@
 #. <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 "U-Bahn"
@@ -30593,5 +30927,5 @@
 #: 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 "veraltet"
@@ -30974,7 +31308,7 @@
 #. <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 "Weg"
@@ -31066,5 +31400,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:842
+#: build/trans_style.java:867
 msgid "services"
 msgstr "Service"
@@ -31078,5 +31412,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:850
+#: build/trans_style.java:875
 msgid "ford"
 msgstr "Furt"
@@ -31097,5 +31431,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:865
+#: build/trans_style.java:890
 msgid "turningcircle"
 msgstr "Wendekreis"
@@ -31110,5 +31444,5 @@
 #. <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 "Notfallrettungspunkt"
@@ -31123,5 +31457,5 @@
 #. <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 "Flussufer"
@@ -31135,5 +31469,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:1018
+#: build/trans_style.java:1043
 msgid "stream"
 msgstr "Fluss"
@@ -31147,5 +31481,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1041
+#: build/trans_style.java:1066
 msgid "dock"
 msgstr "Dock"
@@ -31342,14 +31676,14 @@
 #. <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 "Zivilisationsbauten"
@@ -31363,5 +31697,5 @@
 #. <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 "Stromschnelle"
@@ -31423,7 +31757,7 @@
 #. <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 "Eisenbahnpunkt"
@@ -31446,10 +31780,10 @@
 #. <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 "Andere Bahnen"
 
 #. color otherrail
-#: build/trans_style.java:1192
+#: build/trans_style.java:1217
 msgid "railover"
 msgstr "Eisenbahn-Überlagerung"
@@ -31485,7 +31819,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 "Alte Eisenbahn"
@@ -31531,6 +31865,6 @@
 #. <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 "Rollweg"
@@ -31544,5 +31878,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1327
+#: build/trans_style.java:1352
 msgid "terminal"
 msgstr "Terminal"
@@ -31564,5 +31898,5 @@
 #. <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 "Rollweg (dunkel)"
@@ -31576,5 +31910,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1359
+#: build/trans_style.java:1384
 msgid "aeroway_light"
 msgstr "Rollweg (hell)"
@@ -31644,7 +31978,7 @@
 #. <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 "Luftweg"
@@ -31661,5 +31995,5 @@
 #. <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 "Einfache Piste"
@@ -31674,5 +32008,5 @@
 #. <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 "Mittelschwere Piste"
@@ -31687,5 +32021,5 @@
 #. <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 "Fortgeschrittenenpiste"
@@ -31700,5 +32034,5 @@
 #. <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 "Expertenpiste"
@@ -31713,5 +32047,5 @@
 #. <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 "freie Piste"
@@ -31726,5 +32060,5 @@
 #. <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 "Anfängerpiste"
@@ -31844,11 +32178,11 @@
 #. <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 "Strom"
@@ -31862,5 +32196,5 @@
 #. <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 "Anlegestelle (Pier)"
@@ -31874,5 +32208,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1643
+#: build/trans_style.java:1668
 msgid "pipeline"
 msgstr "Pipeline"
@@ -32016,13 +32350,13 @@
 #. <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 "Freizeit"
@@ -32036,5 +32370,5 @@
 #. <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 "Jachthafen"
@@ -32130,10 +32464,10 @@
 #. <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 "Einrichtungen"
@@ -32235,10 +32569,10 @@
 #. <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 "Verkehrseinrichtungen"
@@ -32627,4 +32961,12 @@
 #.
 #. <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"/>
 #. color amenity_light
@@ -32668,23 +33010,24 @@
 #. <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 "Einrichtungen (hell)"
@@ -32716,6 +33059,6 @@
 #. <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 "Wasser (hell)"
@@ -32776,8 +33119,8 @@
 #. <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 "Gesundheit"
@@ -33130,26 +33473,26 @@
 #. <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 "Geschäft"
@@ -33221,8 +33564,8 @@
 #. <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 "Hotel"
@@ -33323,9 +33666,9 @@
 #. <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 "Tourismus"
@@ -33413,9 +33756,9 @@
 #. <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 "Historisch"
@@ -33428,5 +33771,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3196
+#: build/trans_style.java:3229
 msgid "quarry"
 msgstr "Steinbruch"
@@ -33440,5 +33783,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3204
+#: build/trans_style.java:3237
 msgid "landfill"
 msgstr "Mülldeponie"
@@ -33460,5 +33803,5 @@
 #. <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 "Wasserbecken"
@@ -33472,5 +33815,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3260
+#: build/trans_style.java:3293
 msgid "farmyard"
 msgstr "Farmland"
@@ -33493,5 +33836,5 @@
 #. <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 "Einkaufsbereich"
@@ -33505,5 +33848,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3285
+#: build/trans_style.java:3318
 msgid "industrial"
 msgstr "Industriegebiet"
@@ -33517,5 +33860,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3326
 msgid "brownfield"
 msgstr "Baulücke"
@@ -33529,5 +33872,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3334
 msgid "greenfield"
 msgstr "Bauland"
@@ -33541,5 +33884,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3309
+#: build/trans_style.java:3342
 msgid "railland"
 msgstr "Eisenbahnland"
@@ -33596,7 +33939,7 @@
 #. <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 "Militär"
@@ -33610,5 +33953,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3367
 msgid "cemetery"
 msgstr "Friedhof"
@@ -33621,5 +33964,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3410
+#: build/trans_style.java:3443
 msgid "peak"
 msgstr "Berggipfel"
@@ -33634,5 +33977,5 @@
 #. <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 "Gletscher"
@@ -33646,5 +33989,5 @@
 #. <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 "Vulkan"
@@ -33699,8 +34042,8 @@
 #. <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 "Natur"
@@ -33714,5 +34057,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3485
 msgid "scrub"
 msgstr "Buschland"
@@ -33726,5 +34069,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468
+#: build/trans_style.java:3501
 msgid "heath"
 msgstr "Heide"
@@ -33738,5 +34081,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3476
+#: build/trans_style.java:3509
 msgid "woodarea"
 msgstr "Waldfläche"
@@ -33750,5 +34093,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3508
+#: build/trans_style.java:3541
 msgid "mud"
 msgstr "Schlick & Moor"
@@ -33762,5 +34105,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3516
+#: build/trans_style.java:3549
 msgid "beach"
 msgstr "Strand"
@@ -33910,11 +34253,11 @@
 #. <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 "Ort"
@@ -33928,5 +34271,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4239
+#: build/trans_style.java:4272
 msgid "tiger_data"
 msgstr "Tiger-Daten"
@@ -34282,4 +34625,13 @@
 msgstr "Sizilien - Italien"
 
+#~ 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 ""
+#~ "Zielobjekt mit der ID {0} und Version {1} ist sichtbar obwohl das "
+#~ "Quellobjekt mit der niedrigeren Version {2} nicht sichtbar ist. Diese "
+#~ "Inkonsistenz konnte nicht gelöst werden. Zielobjekt beibehalten. "
+
 #~ msgid "Create non-audio markers when reading GPX."
 #~ msgstr "Nicht Audio-Marken beim Einlesen von GPX erzeugen."
Index: /applications/editors/josm/i18n/po/el.po
===================================================================
--- /applications/editors/josm/i18n/po/el.po	(revision 21970)
+++ /applications/editors/josm/i18n/po/el.po	(revision 21971)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-15 17:35+0200\n"
+"POT-Creation-Date: 2010-06-23 22:47+0200\n"
 "PO-Revision-Date: 2010-04-20 18:36+0000\n"
 "Last-Translator: bastik <Unknown>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-06-15 16:22+0000\n"
+"X-Launchpad-Export-Date: 2010-06-23 20:25+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -23,5 +23,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
@@ -93,5 +93,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
@@ -246,5 +246,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
@@ -267,5 +267,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
@@ -273,6 +273,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
@@ -281,4 +283,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
@@ -316,6 +320,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 ""
 
@@ -339,9 +343,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
@@ -401,4 +405,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
@@ -438,5 +443,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 "Πληροφορίες"
@@ -648,5 +653,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
@@ -661,5 +666,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 "Διαγραφή"
@@ -911,4 +916,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 ""
@@ -923,4 +929,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 "Αυτό μπορεί να έχει επακόλουθο σβήσιμο κόμβων κατα λάθος."
@@ -1475,6 +1482,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
@@ -1501,4 +1508,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
@@ -1507,6 +1516,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 "Σφάλμα"
@@ -1620,6 +1629,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 ""
 "Εμφάνιση αναφοράς κατάστασης με χρήσιμες πληροφορίες οι οποίες μπορούν να "
@@ -1657,8 +1665,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 ""
@@ -1667,5 +1677,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 "Όχι, ακύρωση"
@@ -1673,16 +1684,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 "Παρακαλώ επιλέξτε τουλάχιστον μια διαδρομή προς απλοποίηση."
@@ -1691,13 +1707,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 ""
@@ -1707,8 +1726,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"
@@ -1718,4 +1739,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)"
@@ -1765,6 +1787,5 @@
 msgid_plural "The selected way does not contain all the selected nodes."
 msgstr[0] "Η επιλεγμένη διαδρομή δεν περιέχει τον επιλεγμένο κόμβο."
-msgstr[1] ""
-"Η επιλεγμένη διαδρομή δεν περιέχει όλους τους επιλεγμένους κόμβους."
+msgstr[1] "Η επιλεγμένη διαδρομή δεν περιέχει όλους τους επιλεγμένους κόμβους."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:266
@@ -1853,6 +1874,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 ""
 
@@ -1920,9 +1940,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)"
@@ -1939,5 +1959,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
@@ -2007,5 +2027,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 "Δεν υπάρχουν αλλαγές προς αποστολή"
@@ -2023,14 +2042,14 @@
 msgstr "Αποστολή όλων των αλλαγών της τρέχουσας επιλογής στον διακομιστή OSM"
 
-#: ../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 ""
@@ -2285,5 +2304,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
@@ -2400,6 +2419,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 ""
 
@@ -2487,6 +2506,6 @@
 "move zoom with right button"
 msgstr ""
-"Κάντε ζουμ σέρνοντας ή πατώντας Ctrl+. ή Ctrl+, μετακινήστε πατώντας "
-"Ctrl+πάνω, κάτω, αριστερά, δεξιά ή με το δεξί πλήκτρο του ποντικιού"
+"Κάντε ζουμ σέρνοντας ή πατώντας Ctrl+. ή Ctrl+, μετακινήστε πατώντας Ctrl"
+"+πάνω, κάτω, αριστερά, δεξιά ή με το δεξί πλήκτρο του ποντικιού"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48
@@ -2536,5 +2555,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."
@@ -2652,6 +2671,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 ""
 
@@ -2913,10 +2932,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
@@ -3038,5 +3061,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
@@ -3114,7 +3137,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 ""
 "Πρόκειτε να διαγράψετε κόμβους εκτός της περιοχής που λάβατε.<br> Αυτό "
@@ -3163,11 +3186,11 @@
 msgstr[1] "Μετακίνηση {0} κόμβων"
 
-#: ../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"
@@ -3176,5 +3199,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 #, java-format
 msgid ""
@@ -3183,5 +3206,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}"
@@ -3387,6 +3410,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 ""
 
@@ -3469,5 +3492,5 @@
 #. *
 #. * the decimal format 999.999
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3476,5 +3499,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3483,5 +3506,5 @@
 #. *
 #. * coordinates East/North
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3528,4 +3551,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}"
@@ -3537,29 +3563,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 ""
 
@@ -3638,19 +3658,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 ""
@@ -3659,5 +3679,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 "
@@ -3665,5 +3685,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 ""
@@ -3719,6 +3739,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 ""
 
@@ -3733,5 +3752,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 "επιλεγμένο"
@@ -3895,6 +3914,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 ""
 
@@ -3965,5 +3983,5 @@
 #. color tiger_data
 #. </rule>
-#. 
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -3973,5 +3991,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -3980,5 +3998,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -3987,5 +4005,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -3994,5 +4012,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4001,5 +4019,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4008,9 +4026,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--annotation tags -->
-#. 
+#.
 #. <!--"work in progress" tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="building"/>
@@ -4019,5 +4037,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 "κτίριο"
@@ -4104,5 +4122,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
@@ -4326,5 +4344,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
@@ -4333,4 +4351,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
@@ -4530,5 +4549,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
@@ -4567,6 +4586,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 ""
 
@@ -4597,5 +4616,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"
@@ -4604,5 +4623,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"
@@ -4611,5 +4630,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"
@@ -4825,6 +4844,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 ""
 
@@ -4905,6 +4923,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 ""
 
@@ -4912,6 +4930,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 ""
 
@@ -4962,6 +4980,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 ""
 
@@ -5178,10 +5196,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"
@@ -5190,10 +5210,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
@@ -5275,4 +5297,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 "καμοία"
@@ -5489,7 +5512,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 ""
 
@@ -5514,6 +5537,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 ""
 
@@ -5559,5 +5581,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
@@ -5632,10 +5654,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 ""
 
@@ -5658,5 +5679,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
@@ -5664,5 +5685,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 "Προσθήκη"
@@ -5711,5 +5732,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 "Ιστορικό"
@@ -5769,6 +5790,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192
 msgid "Please enter a valid longitude in the range -180..180"
-msgstr ""
-"Παρακαλώ εισάγεται ενα έγκυρο γεωγραφικό μήκος στην κλίμακα -180..180"
+msgstr "Παρακαλώ εισάγεται ενα έγκυρο γεωγραφικό μήκος στην κλίμακα -180..180"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195
@@ -5930,10 +5950,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 ""
@@ -7391,6 +7411,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 ""
 
@@ -7414,8 +7434,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 ""
 
@@ -7535,9 +7555,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."
@@ -7546,23 +7566,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 "<διαφορετικά>"
 
-#: ../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 "Αλλαγή τιμών;"
 
-#: ../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"
@@ -7571,5 +7591,5 @@
 msgstr[1] "Αλλαγή ιδιοτήτων εώς {0} αντικειμένων"
 
-#: ../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."
@@ -7578,79 +7598,78 @@
 msgstr[1] "Αυτό θα αλλάξει εώς {0} αντικείμενα."
 
-#: ../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 "Παρακαλώ επιλέξτε κλειδί"
 
-#: ../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 "Παρακαλώ επιλέξτε μια τιμή"
 
-#: ../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 "Ιδιότητες/Υπαγωγές"
 
-#: ../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 "Ιδιότητες επιλεγμένων αντικειμένων."
 
 #. 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 "Ιδιότητες: {0} / Υπαγωγές: {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 "Ιδιότητες / Υπαγωγές"
 
-#: ../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 "Αλλαγή σχέσης"
 
-#: ../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 "Σίγουρα επιθυμήτε την διαγραφή της επιλογής από την σχέση {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 "Διαγραφή του επιλεγμένου κλειδιού από όλα τα αντικείμενα"
 
-#: ../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 "Προσθήκη νέου ζεύγους κλειδιού/τιμής σε όλα τα αντικείμενα"
 
-#: ../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 ""
-"Επεξεργασία της τιμής του επιλεγμένου κλειδιού για όλα τα αντικείμενα"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1094
+msgstr "Επεξεργασία της τιμής του επιλεγμένου κλειδιού για όλα τα αντικείμενα"
+
+#: ../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 ""
@@ -7765,6 +7784,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 ""
 
@@ -7782,6 +7801,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 ""
 
@@ -7936,7 +7955,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 ""
 
@@ -8273,7 +8291,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 ""
 
@@ -8414,6 +8431,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 ""
 
@@ -8423,6 +8440,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 ""
 
@@ -8696,9 +8713,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 ""
 
@@ -8713,8 +8729,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 ""
 
@@ -8960,5 +8975,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 ""
@@ -8966,6 +8981,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 ""
 "Το επίπεδο \"{0}\" έχει αλλαγές που πρέπει να αποσταλλούν στον διακομιστή."
@@ -9051,6 +9065,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] ""
@@ -9064,6 +9078,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 "
@@ -9291,5 +9305,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9315,6 +9329,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 ""
 
@@ -9369,6 +9382,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 ""
 
@@ -9422,7 +9435,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 ""
 
@@ -9432,5 +9445,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9446,5 +9459,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..."
@@ -9455,6 +9468,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 ""
 
@@ -9672,7 +9684,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 ""
 
@@ -9698,7 +9710,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 ""
 
@@ -9762,6 +9774,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 ""
 "<html>Η αποστολή μη επεξεργασμένων δεδομένων GPS ως δεδομένα χάρτη θεωρείτε "
@@ -9942,6 +9954,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 ""
 
@@ -10001,7 +10013,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 ""
 
@@ -10580,6 +10592,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 ""
 
@@ -10601,8 +10613,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 ""
 
@@ -10722,6 +10734,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 ""
 
@@ -10831,6 +10843,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 ""
 
@@ -10964,8 +10975,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 ""
 
@@ -11048,8 +11059,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 ""
 
@@ -11076,7 +11087,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 ""
 
@@ -11129,5 +11140,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 "Παρακαλώ επιλέξτε την γραμμή για διαγραφή."
@@ -11484,6 +11495,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 ""
 
@@ -11542,6 +11552,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 ""
 "Εφαρμογή antialiasing σετην προβολή χάρτη με αποτέλεσμα ομαλότερη απεικόνηση."
@@ -11614,5 +11623,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 "Ενεργοποίηση ενσωματωμένων προεπιλογών"
@@ -11632,6 +11641,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>:"
@@ -11756,6 +11764,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 ""
 
@@ -11768,9 +11776,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 ""
 
@@ -11914,6 +11922,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175
 msgid "You have to restart JOSM for some settings to take effect."
-msgstr ""
-"Πρέπει να επανεκινήσετε το JOSM για να εφαρμοστούν κάποιες ρυθμίσεις."
+msgstr "Πρέπει να επανεκινήσετε το JOSM για να εφαρμοστούν κάποιες ρυθμίσεις."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
@@ -12069,6 +12076,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 ""
 
@@ -12079,5 +12086,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 ""
@@ -12087,18 +12094,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 ""
@@ -12107,5 +12114,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 ""
@@ -12114,5 +12121,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 ""
@@ -12121,9 +12128,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 "Προεπιλογές Ετικετών"
@@ -12232,6 +12239,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 ""
 
@@ -12253,6 +12260,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 ""
 
@@ -12331,6 +12338,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 ""
 
@@ -12346,6 +12352,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 ""
 
@@ -12439,6 +12444,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 ""
 
@@ -12571,4 +12576,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 "Αλλαγή ιδιοτήτων"
@@ -12734,5 +12740,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
@@ -12752,5 +12758,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}''"
@@ -12917,6 +12923,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 ""
 
@@ -13033,10 +13038,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 ""
@@ -13044,69 +13049,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 "Με επιτυχία άνοιξε το changeset {0}"
 
-#: ../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}."
@@ -13284,4 +13289,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})"
@@ -13301,6 +13307,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 ""
 
@@ -13328,6 +13334,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 ""
 
@@ -13369,6 +13375,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 ""
 
@@ -13804,6 +13809,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 ""
 
@@ -14016,6 +14021,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 ""
 
@@ -14082,5 +14086,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"
@@ -14163,6 +14167,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 ""
 
@@ -14170,7 +14174,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 ""
 
@@ -14178,7 +14182,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 ""
 
@@ -14186,8 +14190,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 ""
 
@@ -14207,7 +14211,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 ""
 
@@ -14276,7 +14280,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 ""
 
@@ -14288,7 +14291,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 ""
 
@@ -14320,6 +14323,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 ""
 
@@ -14382,6 +14385,6 @@
 "\n"
 msgstr ""
-"Η ρύθμιση της συντόμευσης πληκτρολογίου ''{0}'' για την ενέργεια ''{1}'' "
-"({2}) απέτυχε\n"
+"Η ρύθμιση της συντόμευσης πληκτρολογίου ''{0}'' για την ενέργεια "
+"''{1}'' ({2}) απέτυχε\n"
 "γιατί η συντόμευση είναι ήδη πιασμένη από την ενέργεια ''{3}'' ({4}).\n"
 "\n"
@@ -14827,6 +14830,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>"
@@ -14853,6 +14856,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"
@@ -14890,6 +14893,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"
@@ -14905,7 +14908,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"
@@ -14956,9 +14959,29 @@
 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 "Κτήρια"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#, fuzzy
+msgid "Rotate crosshair"
+msgstr "Περιστροφή δεξιά"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#, fuzzy
+msgid "Advanced settings"
+msgstr "Προχωρημένες προτιμήσεις"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#, fuzzy
+msgid "Building tag:"
+msgstr "Κτήριο"
+
+#: ../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"
@@ -14967,35 +14990,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 "Δημόσιο Κτήριο"
+
+#: ../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 ""
 
@@ -15170,7 +15202,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--waterway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15180,5 +15212,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15188,5 +15220,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15202,5 +15234,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15210,5 +15242,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15216,8 +15248,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 "νερό"
@@ -15239,5 +15271,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15246,5 +15278,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15253,5 +15285,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15260,5 +15292,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15267,5 +15299,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15274,10 +15306,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 "διεύθυνση"
@@ -15306,11 +15338,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 ""
 
@@ -15742,6 +15773,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 "Άδειο επίπεδο"
@@ -15926,4 +15957,52 @@
 msgid "No GPX data layer found."
 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 "Επεξεργασία Ζωολογικού Κήπου"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#, fuzzy
+msgid "Name:"
+msgstr "Όνομα"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#, fuzzy
+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
+#, fuzzy, java-format
+msgid "Delete tool \"{0}\"?"
+msgstr "Διαγραφή κόμβου {0}"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:74
+msgid "Are you sure?"
+msgstr "Είστε σίγουροι;"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
+#, fuzzy
+msgid "New tool..."
+msgstr "Νέος ρόλος"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
+#, fuzzy
+msgid "Install"
+msgstr "Βιομηχανική"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
@@ -16191,5 +16270,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#. 
+#.
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16310,6 +16389,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 ""
 
@@ -16328,10 +16406,9 @@
 #: ../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."
-msgstr ""
-"Ακρίβεια απλοποίησης γραμμών Douglas-Peucker , μετρημένη σε "
-"μοίρες.<br>Χαμηλότερες τιμές δίνουν περισσότερους κόμβους, και ποιό ακριβείς "
+"Accuracy of Douglas-Peucker line simplification, measured in degrees."
+"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
+msgstr ""
+"Ακρίβεια απλοποίησης γραμμών Douglas-Peucker , μετρημένη σε μοίρες."
+"<br>Χαμηλότερες τιμές δίνουν περισσότερους κόμβους, και ποιό ακριβείς "
 "γραμμές. Default 0.0003."
 
@@ -16351,6 +16428,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in East direction (degrees). Default 0."
-msgstr ""
-"Μετατόπιση όλων των σημείων Ανατολικά (μοίρες). Προκαθορισμένη τιμή 0."
+msgstr "Μετατόπιση όλων των σημείων Ανατολικά (μοίρες). Προκαθορισμένη τιμή 0."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
@@ -16648,6 +16724,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 ""
 "Η κεφαλίδα περιέχει πολλαπλές τιμές και δεν μπορεί να αντιστοιχηθεί σε ένα "
@@ -16761,6 +16836,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 ""
 
@@ -16813,6 +16887,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 ""
 
@@ -17176,5 +17249,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}"
@@ -17225,4 +17298,43 @@
 msgid "Revert changeset #{0}"
 msgstr ""
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:78
+#, fuzzy
+msgid "Road Sign Plugin"
+msgstr "Φόρτωση πρόσθετων"
+
+#: ../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 "Αδυναμία μετονομασίας αρχείου ''{0}''"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
+#, fuzzy, java-format
+msgid "Error parsing tagging preset from ''{0}'':\n"
+msgstr ""
+"Σφάλμα αρχικοποίησης δοκιμής {0}:\n"
+" {1}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:104
+#, fuzzy, java-format
+msgid "Sign {0}"
+msgstr "Επιλογή: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:111
+#, fuzzy, java-format
+msgid "Additional sign {0}"
+msgstr "Πρόσθεση σχέσης {0}"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -17329,4 +17441,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 "Απλοποίηση Διαδρομής"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
+#, fuzzy
+msgid "Delete unnecessary nodes from an area."
+msgstr "Διαγραφή μη απαραίτητων κόμβων απο μια διαδρομή."
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
 msgid "Slippy Map"
@@ -18118,6 +18241,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 ""
 
@@ -18203,8 +18326,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 ""
 
@@ -18258,8 +18381,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 ""
 
@@ -18371,6 +18494,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 ""
 
@@ -18378,6 +18501,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 ""
 
@@ -18479,6 +18602,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:79
 msgid "Use the error layer to display problematic elements."
-msgstr ""
-"Χρήση του επιπέδου σφαλμάτων για την προβολή προβληματικών στοιχείων."
+msgstr "Χρήση του επιπέδου σφαλμάτων για την προβολή προβληματικών στοιχείων."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82
@@ -19031,7 +19153,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 ""
 
@@ -19227,9 +19348,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 ""
@@ -19325,11 +19446,147 @@
 msgstr "{0}, ..."
 
-#: ../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
+#, fuzzy, java-format
+msgid "{0} {1}% of GPS track"
+msgstr "το {0} αποτελείται από {1} ίχνος"
+
+#: ../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 "Εισαγωγή Ήχου"
+
+#: ../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 "Αφαίρεση"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
+#, fuzzy
+msgid "removes current video from layer"
+msgstr "Αφαίρεση φωτογραφίας από επίπεδο"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
+#, fuzzy
+msgid "play/pause"
+msgstr "Αναπαραγωγή/παύση"
+
+#: ../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 "φόντο"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
+#, fuzzy
+msgid "jumps n sec back"
+msgstr "Άλμα πίσω."
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "forward"
+msgstr "Εμπρός"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "jumps n sec forward"
+msgstr "Άλμα μπροστά"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
+#, fuzzy
+msgid "faster"
+msgstr "Πιο γρήγορα"
+
+#: ../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 "Πιο αργά"
+
+#: ../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 "Κεντράρισμα του επιπέδου LiveGPS στην τρέχουσα θέση συνεχώς."
+
+#. 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
+#, fuzzy
+msgid "Jump length"
+msgstr "Άλμα εκεί"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#, fuzzy
+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
+#, fuzzy
+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 "επίπεδο"
+
+#: ../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 ""
 
@@ -19542,28 +19799,28 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
 msgid "Automatic downloading"
 msgstr "Αυτόματη λήψη"
 
-#: ../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 ""
@@ -19574,17 +19831,17 @@
 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 "Λήψη εμφανών πλακιδίων"
 
-#: ../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"
@@ -19592,62 +19849,62 @@
 "Η ζητούμενη περιοχή είναι πολύ μεγάλη. Παρακαλώ κάντε ζουμ, ή αλλάξτε ανάλυση"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329
 msgid "Change resolution"
 msgstr "Αλλαγή ανάλυσης"
 
-#: ../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 "Αποθ'ηκευση επιπέδου WMS σε αρχείο"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
 msgid "Save WMS layer"
 msgstr "Αποθήκευση επιπέδου WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413
 msgid "Load WMS layer from file"
 msgstr "Φόρτωση επιπέδου WMS από αρχείο"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
 msgid "Load WMS layer"
 msgstr "Φόρτωση επιπέδου WMS"
 
-#: ../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 "Μη υποστηριζόμενη έκδοση αρχείου WMS΄ βρέθηκε {0}, αναμενόταν {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 "Άνοιγμα ενός κενού επιπέδου WMS για φόρτωση δεδομένων από ένα αρχείο"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
 msgid "WMS Plugin Preferences"
 msgstr "Προτιμήσεις πρόσθετου WMS"
 
-#: ../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 ""
@@ -19655,35 +19912,35 @@
 "πρόσθετου WMS"
 
-#: ../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 "Όνομα μενού"
 
-#: ../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 "WMS URL"
 
-#: ../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 "WMS URL (Προκαθορισμένο)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:86
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
 msgid "Enter a menu name and WMS URL"
 msgstr "Εισάγετε ένα όνομα μενού και ένα WMS URL"
 
-#: ../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 ""
@@ -19701,4 +19958,8 @@
 msgstr ""
 
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186
+msgid "Simultaneous connections"
+msgstr ""
+
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10
@@ -19709,7 +19970,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
@@ -19746,6 +20007,5 @@
 #: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
-msgstr ""
-"Πρέπει να κάνετε τις αλλαγές σας δημόσιες για να στείλετε νέα δεδομένα"
+msgstr "Πρέπει να κάνετε τις αλλαγές σας δημόσιες για να στείλετε νέα δεδομένα"
 
 #. Nominatim search place type
@@ -19760,8 +20020,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 "δάσος"
@@ -19778,7 +20038,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--boundary tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -19788,5 +20048,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -19829,5 +20089,5 @@
 #. color boundary
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -19837,5 +20097,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -19845,5 +20105,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -19853,15 +20113,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 "όριο"
@@ -19877,5 +20137,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -19884,7 +20144,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--route tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -19894,5 +20154,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -19902,5 +20162,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -19910,5 +20170,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -19918,5 +20178,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -19926,5 +20186,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -19934,5 +20194,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -19942,12 +20202,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 "διαδρομή"
@@ -20224,21 +20484,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 "
@@ -20248,10 +20507,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."
@@ -20259,5 +20518,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 "
@@ -20267,15 +20526,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 "
@@ -20284,5 +20543,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 "
@@ -20292,15 +20551,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 "Εισάγει προβλήματα από OpenStreetBugs"
 
 #. 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"
@@ -20308,5 +20567,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."
@@ -20314,5 +20573,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 "
@@ -20321,5 +20580,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 "
@@ -20328,10 +20587,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."
@@ -20339,15 +20598,16 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "Let other applications send commands to JOSM."
 msgstr "Επιτρέπει άλλες εφαρμογές να στέλνουν εντολές στο JOSM."
 
 #. 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 "
@@ -20356,10 +20616,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 "
@@ -20368,15 +20635,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 "
@@ -20386,10 +20653,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). "
@@ -20398,5 +20665,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) "
@@ -20405,5 +20672,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:89
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20412,10 +20679,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 "
@@ -20424,5 +20691,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 "
@@ -20432,5 +20699,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:97
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20442,15 +20709,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 "
@@ -20459,5 +20726,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:105
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21347,10 +21614,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 "κυκλικός κόμβος"
@@ -21487,8 +21754,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"/>
@@ -21698,5 +21965,5 @@
 #. color motorroad
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21706,5 +21973,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21723,5 +21990,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21731,5 +21998,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21748,5 +22015,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -21756,5 +22023,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -21773,5 +22040,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -21781,5 +22048,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -21794,5 +22061,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -21810,8 +22077,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 "Οικιστική"
@@ -21826,5 +22093,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -21833,5 +22100,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--public_transport tags -->
 #. <rule>
@@ -21841,10 +22108,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 ""
@@ -21859,5 +22126,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -21866,5 +22133,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -21874,10 +22141,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 "υπό κατασκευή"
@@ -22883,9 +23150,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 "έλος"
@@ -23215,5 +23482,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -23223,5 +23490,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -23231,5 +23498,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -23239,5 +23506,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -23247,5 +23514,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -23255,5 +23522,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -23263,5 +23530,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -23272,5 +23539,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -23278,9 +23545,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 ""
@@ -24690,5 +24957,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24698,5 +24965,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24706,5 +24973,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24714,5 +24981,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -25076,7 +25343,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--sport tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -25086,5 +25353,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -25094,5 +25361,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -25102,5 +25369,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -25110,5 +25377,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -25118,5 +25385,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -25126,5 +25393,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -25134,5 +25401,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -25142,5 +25409,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -25150,5 +25417,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -25158,5 +25425,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -25166,5 +25433,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -25174,5 +25441,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -25182,5 +25449,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -25190,5 +25457,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -25198,5 +25465,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -25206,5 +25473,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -25214,5 +25481,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -25222,5 +25489,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -25230,5 +25497,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -25238,5 +25505,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -25246,5 +25513,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -25254,5 +25521,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -25262,5 +25529,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -25270,5 +25537,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -25278,5 +25545,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -25286,5 +25553,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -25294,5 +25561,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -25302,5 +25569,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -25310,5 +25577,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -25318,5 +25585,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -25326,5 +25593,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -25334,5 +25601,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -25342,5 +25609,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -25350,5 +25617,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -25358,5 +25625,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -25366,5 +25633,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -25374,5 +25641,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -25382,5 +25649,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -25390,5 +25657,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -25398,5 +25665,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -25406,5 +25673,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -25414,5 +25681,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -25422,5 +25689,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -25430,5 +25697,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -25438,5 +25705,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -25446,33 +25713,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 "άθληση"
@@ -27150,7 +27417,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--landuse tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -27160,5 +27427,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -27168,5 +27435,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -27176,5 +27443,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -27184,5 +27451,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -27192,5 +27459,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -27200,5 +27467,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -27208,5 +27475,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -27216,12 +27483,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 "πράσινο"
@@ -28637,5 +28904,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -28651,5 +28918,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28659,18 +28926,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 -->
@@ -28679,7 +28963,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- cycleway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28689,5 +28973,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28697,5 +28981,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28705,5 +28989,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28713,12 +28997,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 "ποδήλατο"
@@ -28745,5 +29030,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -28759,5 +29044,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -28767,5 +29052,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28774,13 +29059,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"/>
@@ -28791,11 +29084,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 ""
@@ -28814,8 +29108,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 "υπόγειος"
@@ -28927,9 +29221,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
@@ -28937,5 +29231,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,
@@ -28945,8 +29239,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
@@ -28960,5 +29254,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#. 
+#.
 #: build/trans_style.java:72
 msgid "standard"
@@ -28966,5 +29260,5 @@
 
 #. mappaint style named "standard"
-#. 
+#.
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -29013,6 +29307,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>
@@ -29092,5 +29386,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -29100,16 +29394,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 "παρωχημένο"
@@ -29120,5 +29414,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -29127,5 +29421,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -29134,5 +29428,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -29148,5 +29442,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -29160,5 +29454,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -29167,5 +29461,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -29174,5 +29468,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -29181,5 +29475,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -29188,5 +29482,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -29195,5 +29489,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -29202,5 +29496,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxweight"/>
@@ -29209,5 +29503,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxheight"/>
@@ -29216,5 +29510,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -29223,5 +29517,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxlength"/>
@@ -29230,5 +29524,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -29237,5 +29531,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="minspeed"/>
@@ -29244,5 +29538,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxstay"/>
@@ -29251,5 +29545,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="toll"/>
@@ -29258,5 +29552,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="barrier"/>
@@ -29433,7 +29727,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- highway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -29447,5 +29741,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -29455,7 +29749,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- tracktype tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -29465,5 +29759,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -29473,5 +29767,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -29481,5 +29775,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -29489,10 +29783,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 ""
@@ -29503,5 +29797,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -29510,5 +29804,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -29518,5 +29812,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -29525,5 +29819,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -29532,5 +29826,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -29539,5 +29833,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -29546,5 +29840,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -29553,5 +29847,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -29560,5 +29854,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -29567,5 +29861,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -29574,5 +29868,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -29581,8 +29875,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 ""
@@ -29593,8 +29887,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 ""
@@ -29605,5 +29899,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -29612,8 +29906,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 ""
@@ -29624,9 +29918,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 ""
@@ -29637,9 +29931,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 "όχθη ποταμού"
@@ -29650,8 +29944,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 "υδατόρρευμα"
@@ -29662,8 +29956,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 "προβλήτα"
@@ -29674,5 +29968,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29681,5 +29975,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29688,5 +29982,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29696,5 +29990,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29703,5 +29997,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29710,5 +30004,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29717,5 +30011,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29725,5 +30019,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29734,5 +30028,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -29742,7 +30036,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--man_made tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -29752,5 +30046,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -29760,5 +30054,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -29768,5 +30062,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -29777,5 +30071,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -29784,5 +30078,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -29792,5 +30086,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -29800,5 +30094,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -29808,5 +30102,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -29816,5 +30110,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -29824,5 +30118,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -29832,5 +30126,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -29840,5 +30134,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -29848,5 +30142,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -29856,18 +30150,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 ""
@@ -29877,9 +30171,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 ""
@@ -29890,7 +30184,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- railway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -29900,5 +30194,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -29907,5 +30201,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -29915,5 +30209,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -29922,5 +30216,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -29930,5 +30224,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -29938,10 +30232,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 ""
@@ -29952,5 +30246,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -29961,13 +30255,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 ""
@@ -29978,5 +30272,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -29986,5 +30280,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29997,5 +30291,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30003,7 +30297,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 ""
@@ -30014,5 +30308,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -30021,5 +30315,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -30028,5 +30322,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -30035,7 +30329,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aeroway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -30046,9 +30340,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 ""
@@ -30059,8 +30353,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 ""
@@ -30071,5 +30365,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -30079,8 +30373,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 ""
@@ -30091,8 +30385,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 ""
@@ -30103,5 +30397,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -30110,5 +30404,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -30117,7 +30411,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aerialway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -30127,5 +30421,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -30135,5 +30429,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -30143,5 +30437,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -30151,5 +30445,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -30159,10 +30453,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 ""
@@ -30173,11 +30467,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 "πίστα εύκολη"
@@ -30188,9 +30482,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 "πίστα μεσαία"
@@ -30201,9 +30495,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 "πίστα προχορημένη"
@@ -30214,9 +30508,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 ""
@@ -30227,9 +30521,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 ""
@@ -30240,9 +30534,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 "πιστα αρχαρίων"
@@ -30253,7 +30547,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--power tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -30263,5 +30557,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -30270,5 +30564,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -30278,5 +30572,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -30286,5 +30580,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -30294,5 +30588,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -30302,5 +30596,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -30310,5 +30604,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -30318,5 +30612,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -30326,5 +30620,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -30334,5 +30628,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -30342,5 +30636,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -30350,5 +30644,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -30358,15 +30652,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 ""
@@ -30376,9 +30670,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 "προβλήτα"
@@ -30389,8 +30683,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 "αγωγός"
@@ -30400,7 +30694,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--leisure tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -30410,5 +30704,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -30418,5 +30712,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -30426,5 +30720,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -30434,5 +30728,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -30442,5 +30736,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -30450,5 +30744,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -30458,5 +30752,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -30466,5 +30760,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -30474,5 +30768,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -30482,5 +30776,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -30490,5 +30784,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -30498,5 +30792,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -30506,5 +30800,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -30514,5 +30808,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -30522,5 +30816,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -30530,17 +30824,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 "αναψυχή"
@@ -30550,9 +30844,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 ""
@@ -30562,7 +30856,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--amenity tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -30572,5 +30866,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -30580,5 +30874,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -30588,5 +30882,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -30596,5 +30890,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -30604,5 +30898,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -30612,5 +30906,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -30620,5 +30914,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -30628,5 +30922,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -30636,5 +30930,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -30644,14 +30938,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 ""
@@ -30661,5 +30955,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30669,5 +30963,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30677,5 +30971,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30685,5 +30979,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30693,5 +30987,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30701,5 +30995,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30709,5 +31003,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30717,5 +31011,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30725,5 +31019,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30733,5 +31027,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -30741,5 +31035,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -30749,14 +31043,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 ""
@@ -30766,5 +31060,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -30773,5 +31067,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -30781,5 +31075,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -30788,5 +31082,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -30796,5 +31090,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -30804,5 +31098,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -30812,5 +31106,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -30819,5 +31113,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -30827,5 +31121,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -30835,5 +31129,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -30843,5 +31137,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -30851,5 +31145,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -30858,5 +31152,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -30865,5 +31159,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -30872,5 +31166,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -30879,5 +31173,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -30886,5 +31180,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -30893,5 +31187,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -30900,5 +31194,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -30907,5 +31201,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -30914,5 +31208,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -30921,5 +31215,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -30928,5 +31222,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -30935,5 +31229,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -30942,5 +31236,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -30950,5 +31244,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -30958,5 +31252,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -30966,5 +31260,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -30974,5 +31268,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -30982,5 +31276,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -30990,5 +31284,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -30998,5 +31292,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -31006,5 +31300,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -31014,5 +31308,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -31023,5 +31317,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -31031,5 +31325,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -31039,5 +31333,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -31047,5 +31341,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -31055,5 +31349,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -31063,5 +31357,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -31071,5 +31365,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -31079,5 +31373,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -31087,5 +31381,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -31095,5 +31389,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -31103,5 +31397,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -31111,5 +31405,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -31119,5 +31413,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -31127,5 +31421,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -31135,5 +31429,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -31143,5 +31437,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"/>
@@ -31151,5 +31453,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -31159,5 +31461,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -31167,5 +31469,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -31175,5 +31477,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -31182,27 +31484,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 ""
@@ -31212,5 +31515,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -31220,5 +31523,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -31228,12 +31531,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 ""
@@ -31243,5 +31546,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -31251,5 +31554,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -31259,5 +31562,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -31267,5 +31570,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -31275,5 +31578,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -31283,5 +31586,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -31291,11 +31594,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 "υγεία"
@@ -31305,7 +31608,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--shop tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -31315,5 +31618,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -31323,5 +31626,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -31331,5 +31634,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -31339,5 +31642,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -31347,5 +31650,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -31355,5 +31658,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -31363,5 +31666,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -31371,5 +31674,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -31379,5 +31682,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -31387,5 +31690,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -31395,5 +31698,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -31403,5 +31706,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -31411,5 +31714,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -31419,5 +31722,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -31427,5 +31730,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -31435,5 +31738,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -31443,5 +31746,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -31451,5 +31754,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -31459,5 +31762,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -31467,5 +31770,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -31475,5 +31778,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -31483,5 +31786,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -31491,5 +31794,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -31499,5 +31802,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -31507,5 +31810,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -31515,5 +31818,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -31523,5 +31826,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -31531,5 +31834,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -31539,5 +31842,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -31547,5 +31850,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -31555,5 +31858,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -31563,5 +31866,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -31571,5 +31874,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -31579,5 +31882,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -31587,5 +31890,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -31595,5 +31898,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -31603,5 +31906,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -31611,5 +31914,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -31619,5 +31922,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -31627,5 +31930,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -31635,5 +31938,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -31643,31 +31946,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 "κατάστημα"
@@ -31677,7 +31980,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--tourism tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31687,5 +31990,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31695,5 +31998,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31703,5 +32006,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31711,5 +32014,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31719,5 +32022,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31727,5 +32030,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31735,12 +32038,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 "ξενοδοχείο"
@@ -31750,5 +32053,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -31758,5 +32061,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -31766,5 +32069,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -31774,5 +32077,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -31782,5 +32085,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -31790,5 +32093,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -31799,5 +32102,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -31807,5 +32110,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- information tags -->
 #. <rule>
@@ -31815,5 +32118,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -31823,5 +32126,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -31830,5 +32133,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -31837,13 +32140,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 "τουρισμός"
@@ -31853,7 +32156,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--historic tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -31863,5 +32166,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -31871,5 +32174,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -31879,5 +32182,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -31887,5 +32190,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -31895,5 +32198,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -31903,5 +32206,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -31911,5 +32214,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -31919,5 +32222,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -31927,13 +32230,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 "ιστορικό"
@@ -31943,8 +32246,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 "λατομείο"
@@ -31955,8 +32258,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 "Χ.Υ.Τ.Α."
@@ -31967,5 +32270,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -31975,8 +32278,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 "λεκάνη"
@@ -31987,8 +32290,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 ""
@@ -31999,6 +32302,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
-#. 
+#.
+#.
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -32008,8 +32311,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 ""
@@ -32020,8 +32323,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 "βιομηχανική"
@@ -32032,8 +32335,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 ""
@@ -32044,8 +32347,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 ""
@@ -32056,8 +32359,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 ""
@@ -32068,5 +32371,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -32076,7 +32379,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--military tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -32086,5 +32389,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -32094,5 +32397,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -32102,5 +32405,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -32110,11 +32413,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 "στρατιωτική"
@@ -32125,8 +32428,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 "κοιμητήριο"
@@ -32136,8 +32439,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 "κορυφή"
@@ -32148,9 +32451,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 "παγετώνας"
@@ -32160,9 +32463,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 "ηφαίστειο"
@@ -32172,5 +32475,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -32181,5 +32484,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -32189,5 +32492,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -32197,5 +32500,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -32205,5 +32508,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -32213,12 +32516,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 ""
@@ -32228,9 +32531,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 ""
@@ -32240,9 +32543,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 ""
@@ -32252,9 +32555,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 ""
@@ -32264,9 +32567,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 "λάσπη"
@@ -32276,9 +32579,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 "παραλία"
@@ -32289,5 +32592,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?
@@ -32313,5 +32616,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -32322,11 +32625,11 @@
 #. </rule>
 #. -->
-#. 
+#.
 #. <!--name tags -->
-#. 
+#.
 #. <!--preferences tags -->
-#. 
+#.
 #. <!--place tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -32336,5 +32639,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -32344,5 +32647,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -32352,5 +32655,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -32360,5 +32663,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -32368,5 +32671,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -32376,5 +32679,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -32384,5 +32687,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -32392,5 +32695,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -32400,5 +32703,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -32408,5 +32711,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -32416,5 +32719,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -32424,15 +32727,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 ""
@@ -32442,9 +32745,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 ""
@@ -32535,5 +32838,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#. 
+#.
 #. Data type can be:
 #. node        - a node point
@@ -32541,28 +32844,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
@@ -32677,5 +32980,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#. 
+#.
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32688,5 +32991,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>
@@ -32711,6 +33014,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#. 
-#. 
+#.
+#.
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32719,6 +33022,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#. 
-#. 
+#.
+#.
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32733,6 +33036,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
@@ -32746,6 +33049,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
@@ -32765,6 +33068,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#. 
-#. 
+#.
+#.
 #. only for Japan
 #: build/trans_wms.java:39
@@ -32788,6 +33091,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
@@ -32807,6 +33110,6 @@
 #~ "about the problem."
 #~ msgstr ""
-#~ "Το πρόσθετο δεν μπορεί να αφαιρεθεί. Παρακαλώ πείτε στα άτομα από τα οποία "
-#~ "πήρατε το JOSM για το πρόβλημα."
+#~ "Το πρόσθετο δεν μπορεί να αφαιρεθεί. Παρακαλώ πείτε στα άτομα από τα "
+#~ "οποία πήρατε το JOSM για το πρόβλημα."
 
 #~ msgid "Preparing..."
@@ -32825,9 +33128,7 @@
 #~ msgstr "Λανθασμένος κωδικός ή όνομα χρήστη"
 
-#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Δεν βρέθηκε το πρόσθετο: {0}."
 
-#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "Το πρόσθετο απαιτεί ενημέρωση του JOSM: {0}."
@@ -32845,11 +33146,7 @@
 #~ msgstr "Ποδηλατόδρομος"
 
-#~ msgid "Are you sure?"
-#~ msgstr "Είστε σίγουροι;"
-
 #~ msgid "All images"
 #~ msgstr "Όλες οι εικόνες"
 
-#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -32861,5 +33158,4 @@
 #~ " {0}"
 
-#, java-format
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
 #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
@@ -32877,11 +33173,11 @@
 #~ "setting the config option 'pluginmanager.warntime'.)"
 #~ msgstr ""
-#~ "(Μπορείτε να αλλάξετε τις μέρες έπειτα από τις οποίες αυτή η προειδοποίηση "
-#~ "εμφανίζεται <br>θέτωντας την επιλογή 'pluginmanager.warntime' στην "
-#~ "διαμόρφωση.)"
+#~ "(Μπορείτε να αλλάξετε τις μέρες έπειτα από τις οποίες αυτή η "
+#~ "προειδοποίηση εμφανίζεται <br>θέτωντας την επιλογή 'pluginmanager."
+#~ "warntime' στην διαμόρφωση.)"
 
 #~ 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 ""
 #~ "Προσπαθήστε να αναβαθμίσετε στην τελευταία έκδοση του JOSM και όλων των "
@@ -32891,9 +33187,7 @@
 #~ msgstr "Άδειο μέλος στη σχέση."
 
-#, java-format
 #~ msgid "Error: {0}"
 #~ msgstr "Σφάλμα: {0}"
 
-#, java-format
 #~ msgid "Warning: {0}"
 #~ msgstr "Προειδοποίηση: {0}"
@@ -32929,5 +33223,4 @@
 #~ msgstr "Άνοιγμα σε Φυλλομετρητή"
 
-#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Σφάλμα κατά την φόρτωση της σελίδας {0}"
@@ -32949,9 +33242,9 @@
 
 #~ 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 ""
-#~ "Η ενεργοποίηση των ενημερωμένων πρόσθετων απέτυχε. Ελέγξτε αν το JOSM έχει "
-#~ "άδεια αντικατάστασης των υπαρχόντων."
+#~ "Η ενεργοποίηση των ενημερωμένων πρόσθετων απέτυχε. Ελέγξτε αν το JOSM "
+#~ "έχει άδεια αντικατάστασης των υπαρχόντων."
 
 #~ msgid "Set the language."
@@ -32959,5 +33252,6 @@
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you load\n"
+#~ "Parameters are read in the order they are specified, so make sure you "
+#~ "load\n"
 #~ "some data before --selection"
 #~ msgstr ""
@@ -32976,17 +33270,13 @@
 #~ msgstr "όνομα"
 
-#, java-format
 #~ msgid "Images for {0}"
 #~ msgstr "Εικόνες για {0}"
 
-#, java-format
 #~ msgid "GPS start: {0}"
 #~ msgstr "Αρχή GPS: {0}"
 
-#, java-format
 #~ msgid "current delta: {0}s"
 #~ msgstr "τρέχουσα διαφορά: {0} δευτερόλεπτα"
 
-#, java-format
 #~ msgid "GPS end: {0}"
 #~ msgstr "Τέλος GPS: {0}"
@@ -33003,10 +33293,9 @@
 #~ msgstr "Εικόνα"
 
-#, 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 "Το πρόσθετο {0} μοιάζει χαλασμένο ή δεν μπόρεσε να ληφθεί αυτόματα."
 
-#, java-format
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Αδυναμία λήψης πρόσθετου: {0} από {1}"
@@ -33014,5 +33303,6 @@
 #~ msgid "Include your steps to get to the error (as detailed as possible)!"
 #~ msgstr ""
-#~ "Συμπεριλάβετε τα βήματα ποθ οδήγησαν στο σφάλμα (όσο πιο λεπτομερώς γίνεται)!"
+#~ "Συμπεριλάβετε τα βήματα ποθ οδήγησαν στο σφάλμα (όσο πιο λεπτομερώς "
+#~ "γίνεται)!"
 
 #~ msgid "Be sure to include the following information:"
@@ -33022,5 +33312,4 @@
 #~ msgstr "διαφορετικά"
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -33037,16 +33326,16 @@
 
 #~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this as "
-#~ "a bug."
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
 #~ msgstr ""
-#~ "Εσωτερικό σφάλμα: αδύνατος ο έλεγχος συνθηκών για κανένα επίπεδο. Παρακαλώ "
-#~ "αναφέρετε το σαν σφάλμα."
+#~ "Εσωτερικό σφάλμα: αδύνατος ο έλεγχος συνθηκών για κανένα επίπεδο. "
+#~ "Παρακαλώ αναφέρετε το σαν σφάλμα."
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still want "
-#~ "to merge them?"
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
 #~ msgstr ""
-#~ "Οι επιλεγμένοι κόμβοι είναι μέλη σε διαφορετικές σχέσεις. Επιθυμείτε να τους "
-#~ "συγχωνεύσετε;"
+#~ "Οι επιλεγμένοι κόμβοι είναι μέλη σε διαφορετικές σχέσεις. Επιθυμείτε να "
+#~ "τους συγχωνεύσετε;"
 
 #~ msgid "Merge nodes with different memberships?"
@@ -33074,9 +33363,7 @@
 #~ msgstr "Συγχρονισμός ρολογιού"
 
-#, java-format
 #~ msgid "The date in file \"{0}\" could not be parsed."
 #~ msgstr "Η ημερομηνία στο αρχείο \"{0}\" δεν μπόρεσε να ερμηνευθεί."
 
-#, java-format
 #~ msgid "There is no EXIF time within the file \"{0}\"."
 #~ msgstr "Δεν υπάρχει ώρα EXIF μέσα στο αρχείο \"{0}\"."
@@ -33088,6 +33375,6 @@
 #~ "Login password to the OSM account. Leave blank to not store any password."
 #~ msgstr ""
-#~ "Κωδικός χρήστη για τον λογαριασμό OSM. Αφήστε κενό για να μην αποθηκευθεί ο "
-#~ "κωδικός."
+#~ "Κωδικός χρήστη για τον λογαριασμό OSM. Αφήστε κενό για να μην αποθηκευθεί "
+#~ "ο κωδικός."
 
 #~ msgid "Plugin already exists"
@@ -33116,9 +33403,9 @@
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version selected "
-#~ "in the history list."
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
 #~ msgstr ""
-#~ "Επαναφορά της κατάστασης όλων των επιλεγμένων αντικειμένων στην έκδοση που "
-#~ "έχει απιλεγεί στη λίστα ιστορικού."
+#~ "Επαναφορά της κατάστασης όλων των επιλεγμένων αντικειμένων στην έκδοση "
+#~ "που έχει απιλεγεί στη λίστα ιστορικού."
 
 #~ msgid "their version:"
@@ -33143,9 +33430,7 @@
 #~ msgstr "Online βοήθεια του JOSM"
 
-#, java-format
 #~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
 #~ msgstr "Αδύνατη η ανάγνωση ώρας \"{0}\" από το σημείο {1} x {2}"
 
-#, java-format
 #~ msgid "No time for point {0} x {1}"
 #~ msgstr "Δεν υπάρχει ώρα για το σημείο {0} x {1}"
@@ -33154,5 +33439,4 @@
 #~ msgstr "Λήψη πρόσθετων που λείπουν"
 
-#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -33161,6 +33445,6 @@
 #~ "{0}"
 #~ msgstr ""
-#~ "Το αρχείο του πρόσθετου είναι ήδη διαθέσιμο. Θέλετε να λάβετε την τρέχουσα "
-#~ "έκδοση διαγράφοντας το υπάρχον αρχείο;\n"
+#~ "Το αρχείο του πρόσθετου είναι ήδη διαθέσιμο. Θέλετε να λάβετε την "
+#~ "τρέχουσα έκδοση διαγράφοντας το υπάρχον αρχείο;\n"
 #~ "\n"
 #~ "{0}"
@@ -33194,11 +33478,12 @@
 
 #~ msgid ""
-#~ "You are about to delete nodes outside of the area you have "
-#~ "downloaded.<br>This can cause problems because other objects (that you don't "
-#~ "see) might use them.<br>Do you really want to delete?"
+#~ "You are about to delete nodes outside of the area you have downloaded."
+#~ "<br>This can cause problems because other objects (that you don't see) "
+#~ "might use them.<br>Do you really want to delete?"
 #~ msgstr ""
 #~ "Πρόκειτε να διαγράψετε κόμβους εκτός της περιοχής που λάβατε.<br> Αυτό "
-#~ "μπορεί να δημιουργήσει προβλήματα γιατί άλλα αντικείμενα (που δεν βλέπετε) "
-#~ "μπορεί να τους χρησιμοποιούν.<br>Είστε σίγουροι οτι επιθυμείτε διαγραφή;"
+#~ "μπορεί να δημιουργήσει προβλήματα γιατί άλλα αντικείμενα (που δεν "
+#~ "βλέπετε) μπορεί να τους χρησιμοποιούν.<br>Είστε σίγουροι οτι επιθυμείτε "
+#~ "διαγραφή;"
 
 #~ msgid "Email"
@@ -33209,9 +33494,7 @@
 #~ "Η επεξεργασία σελίδων βοήθειας έιναι δυνατή μόνο από το JOSM Online Help"
 
-#, java-format
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "Χρήση προεπιλογής \"{0}\" από ομάδα \"{1}\""
 
-#, java-format
 #~ msgid "Use preset ''{0}''"
 #~ msgstr "Χρήση προεπιλογής \"{0}\""
@@ -33223,5 +33506,4 @@
 #~ msgstr "Δεν βρέθηκαν εικόνες με αναγνώσιμη χρονοσήμανση."
 
-#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} μέσα στο ίχνος"
@@ -33242,9 +33524,7 @@
 #~ msgstr "Σφάλμα κατά την ανάλυση της απάντησης του διακομιστή."
 
-#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "Συγγραφείς: {0}"
 
-#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Σωρός Εντολών: {0}"
@@ -33342,6 +33622,6 @@
 #~ "some time."
 #~ msgstr ""
-#~ "Ο διακομιστής επέστρεψε εσωτερικό σφάλμα. Δοκιμάστε μια μικρότερη περιοχή ή "
-#~ "ξαναδοκιμάστε αργότερα."
+#~ "Ο διακομιστής επέστρεψε εσωτερικό σφάλμα. Δοκιμάστε μια μικρότερη περιοχή "
+#~ "ή ξαναδοκιμάστε αργότερα."
 
 #~ msgid "There were conflicts during import."
@@ -33354,5 +33634,4 @@
 #~ msgstr "Οδός \"από\" δεν βρέθηκε."
 
-#, java-format
 #~ msgid "Inner way ''{0}'' is outside."
 #~ msgstr "Εσωτερικός δρόμος \"{0}\" είναι από έξω."
@@ -33370,5 +33649,4 @@
 #~ msgstr "Επιβεβαίωση συγχώνευσης"
 
-#, java-format
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
@@ -33381,13 +33659,10 @@
 #~ msgstr "Σφάλματα κατά την λήψη"
 
-#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "Επικοινωνήστε με {0}"
 
-#, java-format
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "Αδυναμία ανάγνωσης από το URL: \"{0}\""
 
-#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Αδυναμία ανοίγματος φακέλου προτιμήσεων: {0}"
@@ -33396,9 +33671,7 @@
 #~ msgstr "Αντικρουόμενη σχέση"
 
-#, java-format
 #~ msgid "Unknown role ''{0}''."
 #~ msgstr "Άγνωστος ρόλος \"{0}\"."
 
-#, java-format
 #~ msgid "Unknown member type for ''{0}''."
 #~ msgstr "Άγνωστος τύπος μέλους για το \"{0}\""
@@ -33407,5 +33680,4 @@
 #~ msgstr "επιλυμένη έκδοση:"
 
-#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -33428,5 +33700,4 @@
 #~ msgstr "Μετακίνηση Πάνω"
 
-#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Επεξεργαστής Σχέσεων: {0}"
@@ -33441,9 +33712,7 @@
 #~ msgstr "Εικόνες χωρίς θέση exif"
 
-#, java-format
 #~ msgid "Offset between track and photos: {0}m {1}s"
 #~ msgstr "Απόκλειση ανάμεσα σε ίχνος και φωτογραφίες: {0}λ {1}δ"
 
-#, java-format
 #~ msgid "Change the projection to {0} first."
 #~ msgstr "Αλλάξτε την προβολή σε {0} πρώτα."
@@ -33466,5 +33735,4 @@
 #~ msgstr "Εμφάνιση πίνακα Συγγραφέα"
 
-#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Παρακαλώ αναφέρετε ένα δελτίο στο {0}"
@@ -33489,8 +33757,9 @@
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data layer?"
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
 #~ msgstr ""
-#~ "Δεν βρέθηκαν δεδομένα για ενημέρωση. Έχετε ήδη ανοίξει ή λάβει ένα επίπεδο "
-#~ "δεδομένων;"
+#~ "Δεν βρέθηκαν δεδομένα για ενημέρωση. Έχετε ήδη ανοίξει ή λάβει ένα "
+#~ "επίπεδο δεδομένων;"
 
 #~ msgid "Please select one or more closed ways of at least four nodes."
@@ -33504,11 +33773,10 @@
 #~ "διακομιστή."
 
-#, java-format
 #~ msgid ""
 #~ "Current number of changes exceeds the max. number of changes, current is "
 #~ "{0}, max is {1}"
 #~ msgstr ""
-#~ "Ο τρέχων αριθμός αλλαγών υπερβαίνει το μέγιστο αριθμό αλλαγών, τρέχων είναι "
-#~ "{0}, μέγιστος είναι {1}"
+#~ "Ο τρέχων αριθμός αλλαγών υπερβαίνει το μέγιστο αριθμό αλλαγών, τρέχων "
+#~ "είναι {0}, μέγιστος είναι {1}"
 
 #~ msgid "Failed to initialize API. Please try again later."
@@ -33568,14 +33836,14 @@
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr ""
-#~ "Η σελίδα βοήθειας λείπει. Δημιουργήστε την στα <A HREF=\"{0}\">αγγλικά</A>."
+#~ "Η σελίδα βοήθειας λείπει. Δημιουργήστε την στα <A HREF=\"{0}\">αγγλικά</"
+#~ "A>."
 
 #~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
 #~ msgstr ""
-#~ "Η σελίδα βοήθειας λείπει. Δημιουργήστε την στα <A HREF=\"{0}\">αγγλικά</A> ή "
-#~ "<A HREF=\"{1}\">στη γλώσσα σας</A>."
-
-#, java-format
+#~ "Η σελίδα βοήθειας λείπει. Δημιουργήστε την στα <A HREF=\"{0}\">αγγλικά</"
+#~ "A> ή <A HREF=\"{1}\">στη γλώσσα σας</A>."
+
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "μη αναμενόμενη επιστρεφόμενη τιμή. Λήφθηκε {0}"
Index: /applications/editors/josm/i18n/po/en_AU.po
===================================================================
--- /applications/editors/josm/i18n/po/en_AU.po	(revision 21970)
+++ /applications/editors/josm/i18n/po/en_AU.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-11 21:00+0000\n"
+"POT-Creation-Date: 2010-06-23 22:47+0200\n"
+"PO-Revision-Date: 2010-06-15 17:47+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: English (Australia) <en_AU@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-06-15 16:18+0000\n"
+"X-Launchpad-Export-Date: 2010-06-23 20:22+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -23,5 +23,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
@@ -93,5 +93,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
@@ -252,5 +252,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
@@ -273,5 +273,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
@@ -279,6 +279,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
@@ -287,4 +289,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
@@ -322,9 +326,9 @@
 #, java-format
 msgid ""
-"<html>There are no layers the source layer<br>''{0}''<br>could be merged "
-"to.</html>"
-msgstr ""
-"<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 ""
+"<html>There are no layers the source layer<br>''{0}''<br>could be merged to."
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:81
@@ -347,9 +351,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
@@ -409,4 +413,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
@@ -446,5 +451,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 "Information"
@@ -658,5 +663,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
@@ -671,5 +676,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 "Delete"
@@ -918,13 +923,14 @@
 #: ../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 ""
 "The selected ways have nodes outside of the downloaded data region."
 msgstr[0] "The selected way has nodes outside of the downloaded data region."
-msgstr[1] ""
-"The selected ways have nodes outside of the downloaded data region."
+msgstr[1] "The selected ways have nodes outside of the downloaded data region."
 
 #: ../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 "This can lead to nodes being deleted accidentally."
@@ -1495,6 +1501,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
@@ -1521,4 +1527,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
@@ -1527,6 +1535,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 "Error"
@@ -1642,6 +1650,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 ""
 "Show status report with useful information that can be attached to bugs"
@@ -1678,8 +1685,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 "Yes, delete nodes"
 
 #: ../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 "Delete nodes outside of downloaded data regions"
@@ -1688,5 +1697,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 "No, abort"
@@ -1694,16 +1704,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 "Cancel operation"
 
 #: ../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 "Do you want to delete them anyway?"
 
 #: ../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 "Delete nodes outside of data regions?"
 
 #: ../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 "Please select at least one way to simplify."
@@ -1712,13 +1727,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 "Yes"
 
 #: ../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 "Simplify all selected ways"
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:126
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:89
 #, java-format
 msgid ""
@@ -1728,8 +1746,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 "Simplify ways?"
 
 #: ../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"
@@ -1739,4 +1759,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)"
@@ -1874,8 +1895,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid ""
-"* One node that is used by more than one way and one of those ways, or"
-msgstr ""
-"* 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 "* One node that is used by more than one way and one of those ways, or"
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
@@ -1946,9 +1965,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)"
@@ -1965,5 +1984,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
@@ -2031,5 +2050,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 "No changes to upload."
@@ -2047,14 +2065,14 @@
 msgstr "Upload all changes in the current selection to the OSM server."
 
-#: ../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 "Checking parents for deleted objects"
 
-#: ../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 "Reading parents of ''{0}''"
 
-#: ../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 "Checking for deleted parents in the local dataset"
@@ -2312,5 +2330,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
@@ -2429,9 +2447,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
 msgid ""
-"Drag play head and release near track to play audio from there; "
-"SHIFT+release to synchronize audio at that point."
-msgstr ""
-"Drag play head and release near track to play audio from there; "
-"SHIFT+release to synchronise 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 ""
+"Drag play head and release near track to play audio from there; SHIFT"
+"+release to synchronise audio at that point."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
@@ -2566,5 +2584,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."
@@ -2687,9 +2705,9 @@
 #: ../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)"
-msgstr ""
-"<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 ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
+"min-max)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
@@ -2859,6 +2877,5 @@
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
-msgstr ""
-"Unknown primitive type: {0}. Allowed values are node, way or relation"
+msgstr "Unknown primitive type: {0}. Allowed values are node, way or relation"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
@@ -2968,10 +2985,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
@@ -3097,5 +3118,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
@@ -3174,11 +3195,11 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231
 msgid ""
-"You are about to delete nodes outside of the area you have "
-"downloaded.<br>This can cause problems because other objects (that you do "
-"not see) might use them.<br>Do you really want to delete?"
-msgstr ""
-"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 ""
+"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?"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
@@ -3223,11 +3244,11 @@
 msgstr[1] "Move {0} nodes"
 
-#: ../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 "Purged object ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111
 #, java-format
 msgid "Purged {0} object"
@@ -3236,5 +3257,5 @@
 msgstr[1] "Purged {0} objects"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 #, java-format
 msgid ""
@@ -3245,5 +3266,5 @@
 "{1}"
 
-#: ../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}"
@@ -3464,9 +3485,9 @@
 #, java-format
 msgid ""
-"<html>Preferences file had errors.<br> Making backup of old one to "
-"<br>{0}<br> and creating a new default preference file.</html>"
-msgstr ""
-"<html>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 ""
+"<html>Preferences file had errors.<br> Making backup of old one to <br>{0}"
+"<br> and creating a new default preference file.</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
@@ -3556,5 +3577,5 @@
 #. *
 #. * the decimal format 999.999
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3563,5 +3584,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3570,5 +3591,5 @@
 #. *
 #. * coordinates East/North
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3619,4 +3640,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}"
@@ -3628,33 +3652,24 @@
 msgstr "Missing merge target for object with id {0}"
 
-#: ../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 "Missing merge target for node with id {0}"
 
-#: ../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 "Missing merge target for relation with id {0}"
 
-#: ../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 "Missing merge target of type {0} with id {1}"
-
-#. 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 ""
-"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. "
 
 #. translators notes must be in front
@@ -3732,19 +3747,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 "A primitive with ID = 0 cannot be invisible."
 
-#: ../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 "ID > 0 expected. Got {0}."
 
-#: ../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 "version > 0 expected. Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:795
 #, java-format
 msgid ""
@@ -3755,5 +3770,5 @@
 "{0}"
 
-#: ../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 "
@@ -3763,5 +3778,5 @@
 "other is not"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1169
 #, java-format
 msgid ""
@@ -3820,8 +3835,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
 #, java-format
-msgid ""
-"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
-msgstr ""
-"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgstr "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
@@ -3835,5 +3848,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 "selected"
@@ -3999,6 +4012,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 ""
 "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
@@ -4070,5 +4082,5 @@
 #. color tiger_data
 #. </rule>
-#. 
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4078,5 +4090,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4085,5 +4097,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4092,5 +4104,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4099,5 +4111,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4106,5 +4118,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4113,9 +4125,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--annotation tags -->
-#. 
+#.
 #. <!--"work in progress" tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="building"/>
@@ -4124,5 +4136,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 "building"
@@ -4209,5 +4221,5 @@
 msgstr "Object deleted"
 
-#: ../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
@@ -4342,6 +4354,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
-msgstr ""
-"Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
+msgstr "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
@@ -4440,5 +4451,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
@@ -4447,4 +4458,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
@@ -4653,5 +4665,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
@@ -4692,11 +4704,11 @@
 "<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 ""
 "<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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
@@ -4726,5 +4738,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"
@@ -4733,5 +4745,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"
@@ -4740,5 +4752,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"
@@ -4964,8 +4976,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566
-msgid ""
-"Copy their selected elements to the end of the list of merged elements."
-msgstr ""
-"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 "Copy their selected elements to the end of the list of merged elements"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:588
@@ -5048,6 +5058,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their "
-"entries.</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 "<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
@@ -5056,9 +5066,9 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their "
-"entries.</html>"
-msgstr ""
-"<html>Click <strong>{0}</strong> to finish merging my and their "
-"entries</html>"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
+"html>"
+msgstr ""
+"<html>Click <strong>{0}</strong> to finish merging my and their entries</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:873
@@ -5110,9 +5120,9 @@
 #, java-format
 msgid ""
-"<html>An error occurred while communicating with the server<br>Details: "
-"{0}</html>"
-msgstr ""
-"<html>An error occurred while communicating with the server<br>Details: "
-"{0}</html>"
+"<html>An error occurred while communicating with the server<br>Details: {0}</"
+"html>"
+msgstr ""
+"<html>An error occurred while communicating with the server<br>Details: {0}</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
@@ -5340,10 +5350,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"
@@ -5352,10 +5364,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
@@ -5437,4 +5451,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 "none"
@@ -5650,6 +5665,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:43
 msgid "<html>Please select the values to keep for the following tags.</html>"
-msgstr ""
-"<html>Please select the values to keep for the following tags.</html>"
+msgstr "<html>Please select the values to keep for the following tags.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:48
@@ -5667,11 +5681,11 @@
 #: ../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>"
-msgstr ""
-"<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 ""
+"<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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
@@ -5695,8 +5709,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:350
-msgid ""
-"Download information about the selected changesets from the OSM server"
-msgstr ""
-"Download information about the selected changesets from the OSM server"
+msgid "Download information about the selected changesets from the OSM server"
+msgstr "Download information about the selected changesets from the OSM server"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:385
@@ -5741,5 +5753,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
@@ -5813,17 +5825,15 @@
 #, 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>"
-msgstr ""
-"<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 ""
+"<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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
@@ -5845,5 +5855,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
@@ -5851,5 +5861,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 "Add"
@@ -5898,5 +5908,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 "History"
@@ -6116,10 +6126,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 "Select in relation list"
 
 #: ../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 "Select relation in relation list."
@@ -6276,6 +6286,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:450
 msgid "Updates the selected changesets with current data from the OSM server"
-msgstr ""
-"Updates the selected changesets with current data from the OSM server"
+msgstr "Updates the selected changesets with current data from the OSM server"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:475
@@ -7609,9 +7618,9 @@
 #, 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>"
-msgstr ""
-"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 ""
+"Please enter a date in the usual format for your locale.<br>Example: {0}"
+"<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1127
@@ -7638,8 +7647,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 ""
 
@@ -7744,6 +7753,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
 msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
-msgstr ""
-"Please enter or paste an URL to retrieve changesets from the OSM API."
+msgstr "Please enter or paste an URL to retrieve changesets from the OSM API."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
@@ -7764,9 +7772,9 @@
 msgstr "This changeset query URL is invalid"
 
-#: ../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 "Add Properties"
 
-#: ../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."
@@ -7775,23 +7783,23 @@
 msgstr[1] "This will change up to {0} objects."
 
-#: ../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 "An empty value deletes the tag."
 
-#: ../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 "<different>"
 
-#: ../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 "Change values?"
 
-#: ../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"
@@ -7800,5 +7808,5 @@
 msgstr[1] "Change properties of up to {0} objects"
 
-#: ../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."
@@ -7807,77 +7815,77 @@
 msgstr[1] "This will change up to {0} objects."
 
-#: ../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 "Please select a key"
 
-#: ../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 "Please select a value"
 
-#: ../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 "Please select the objects you want to change properties for."
 
-#: ../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 "Properties/Memberships"
 
-#: ../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 "Properties for selected objects."
 
 #. 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 "Member Of"
 
-#: ../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 "Properties: {0} / Memberships: {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 "Properties / Memberships"
 
-#: ../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 "Change relation"
 
-#: ../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 "Delete from relation"
 
-#: ../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 "Really delete selection from relation {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 "Delete the selected key in all objects"
 
-#: ../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 "Delete Properties"
 
-#: ../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 "Add a new key/value pair to all objects"
 
-#: ../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 "Edit the value of the selected key for all objects"
 
-#: ../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 "Select relation"
 
-#: ../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 "Select relation in main selection."
@@ -7945,6 +7953,5 @@
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-"Warning: ignoring exception because task is cancelled. Exception: {0}"
+msgstr "Warning: ignoring exception because task is cancelled. Exception: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:93
@@ -7995,10 +8002,10 @@
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
-"relation itself.<br>This creates circular dependencies and is "
-"discouraged.<br>How do you want to proceed with circular dependencies?</html>"
+"relation itself.<br>This creates circular dependencies and is discouraged."
+"<br>How do you want to proceed with circular dependencies?</html>"
 msgstr ""
 "<html>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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
@@ -8015,10 +8022,10 @@
 msgid ""
 "<html>This relation already has one or more members referring to<br>the "
-"primitive ''{0}''<br><br>Do you really want to add another relation "
-"member?</html>"
+"primitive ''{0}''<br><br>Do you really want to add another relation member?</"
+"html>"
 msgstr ""
 "<html>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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612
@@ -8175,6 +8182,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Click to return to the relation editor and to resume relation editing"
-msgstr ""
-"Click to return to the relation editor and to resume relation editing"
+msgstr "Click to return to the relation editor and to resume relation editing"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
@@ -8191,11 +8197,9 @@
 #, java-format
 msgid ""
-"<html>Layer ''{0}'' already has a conflict for "
-"primitive<br>''{1}''.<br>Please resolve this conflict first, then try "
-"again.</html>"
-msgstr ""
-"<html>Layer ''{0}'' already has a conflict for "
-"primitive<br>''{1}''.<br>Please resolve this conflict first, then try "
-"again.</html>"
+"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
+"<br>Please resolve this conflict first, then try again.</html>"
+msgstr ""
+"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
+"<br>Please resolve this conflict first, then try again.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
@@ -8311,6 +8315,5 @@
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-"Warning: ignoring exception because task is cancelled. Exception: {0}"
+msgstr "Warning: ignoring exception because task is cancelled. Exception: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
@@ -8535,11 +8538,9 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is "
-"enabled.<br>Please chose to either download OSM data, or GPX data, or "
-"both.</html>"
-msgstr ""
-"<html>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 ""
+"<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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
@@ -8679,6 +8680,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 ""
 "<html><p class=\"warning-header\">Help content for help topic missing</p><p "
@@ -8687,6 +8688,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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
@@ -8695,11 +8696,11 @@
 "<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 ""
 "<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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355
@@ -8983,18 +8984,16 @@
 "version of one<br>of your nodes, ways, or relations.<br>The conflict is "
 "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click "
-"<strong>{4}</strong> to synchronize the conflicting primitive only.<br>Click "
-"<strong>{5}</strong> to synchronize the entire local dataset with the "
-"server.<br>Click <strong>{6}</strong> to abort and continue "
-"editing.<br></html>"
+"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
+"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
+"strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{6}</strong> to abort and continue editing.<br></html>"
 msgstr ""
 "<html>Uploading <strong>failed</strong> because the server has a newer "
 "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 synchronise the conflicting primitive only.<br>Click "
-"<strong>{5}</strong> to synchronise 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 synchronise the conflicting primitive only.<br>Click <strong>{5}</"
+"strong> to synchronise the entire local dataset with the server.<br>Click "
+"<strong>{6}</strong> to abort and continue editing.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
@@ -9008,14 +9007,12 @@
 msgid ""
 "<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click "
-"<strong>{0}</strong> to synchronize the entire local dataset with the "
-"server.<br>Click <strong>{1}</strong> to abort and continue "
-"editing.<br></html>"
+"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
+"</strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{1}</strong> to abort and continue editing.<br></html>"
 msgstr ""
 "<html>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 synchronise 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 synchronise the entire local dataset with the server.<br>Click "
+"<strong>{1}</strong> to abort and continue editing.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194
@@ -9283,5 +9280,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 "No"
@@ -9289,6 +9286,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 ""
 "Layer ''{0}'' has modifications which should be uploaded to the server."
@@ -9380,6 +9376,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] ""
 "<html>{0} layer needs saving but has no associated file.<br>Either select a "
@@ -9387,6 +9383,6 @@
 msgstr[1] ""
 "<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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
@@ -9398,6 +9394,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 "
@@ -9406,6 +9402,6 @@
 msgstr[0] ""
 "<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>"
 msgstr[1] ""
 "<html>{0} layers need saving but have associated files<br>which cannot be "
@@ -9633,5 +9629,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9661,8 +9657,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:55
-msgid ""
-"The changeset is going to be <strong>closed</strong> after this upload"
-msgstr ""
-"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 "The changeset is going to be <strong>closed</strong> after this upload"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:57
@@ -9727,9 +9721,9 @@
 #, java-format
 msgid ""
-"Uploading <strong>{0} objects</strong> to <strong>multiple "
-"changesets</strong> using <strong>{1} requests</strong>"
-msgstr ""
-"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 ""
+"Uploading <strong>{0} objects</strong> to <strong>multiple changesets</"
+"strong> using <strong>{1} requests</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:67
@@ -9785,7 +9779,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 ""
 "Click ''<strong>{0}</strong>'' to continue uploading to additional new "
@@ -9799,5 +9793,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9815,5 +9809,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..."
@@ -9824,6 +9818,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 ""
 "Ignoring caught exception because upload is cancelled. Exception is: {0}"
@@ -9856,6 +9849,5 @@
 #, java-format
 msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
-msgstr ""
-"Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgstr "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94
@@ -10053,11 +10045,11 @@
 #, 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>"
-msgstr ""
-"<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 ""
+"<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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
@@ -10082,11 +10074,11 @@
 #, 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>"
-msgstr ""
-"<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 ""
+"<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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
@@ -10149,9 +10141,9 @@
 #: ../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:"
-msgstr ""
-"<html>Upload of unprocessed GPS data as map data is considered "
-"harmful.<br>If you want to upload traces, look here:"
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
@@ -10341,9 +10333,9 @@
 #: ../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>"
-msgstr ""
-"<html>Upload of unprocessed GPS data as map data is considered "
-"harmful.<br>If you want to upload traces, look here:</html>"
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:</html>"
+msgstr ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
@@ -10402,11 +10394,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
 msgid ""
-"<html>Take a photo of your GPS receiver while it displays the "
-"time.<br>Display that photo here.<br>And then, simply capture the time you "
-"read on the photo and select a timezone<hr></html>"
-msgstr ""
-"<html>Take a photo of your GPS receiver while it displays the "
-"time.<br>Display that photo here.<br>And then, simply capture the time you "
-"read on the photo and select a timezone<hr></html>"
+"<html>Take a photo of your GPS receiver while it displays the time."
+"<br>Display that photo here.<br>And then, simply capture the time you read "
+"on the photo and select a timezone<hr></html>"
+msgstr ""
+"<html>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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
@@ -10542,6 +10534,5 @@
 "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track.</html>"
 msgstr[0] "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
-msgstr[1] ""
-"<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track.</html>"
+msgstr[1] "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
@@ -11007,11 +10998,11 @@
 "<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 ""
 "<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 authorises the user and retrieves an Access "
-"Token.</html>"
+"fully<br>automatically authorises the user and retrieves an Access Token.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:80
@@ -11039,13 +11030,13 @@
 #: ../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."
-msgstr ""
-"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 ""
+"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."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:111
@@ -11178,10 +11169,10 @@
 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 ""
 "<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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:58
@@ -11297,6 +11288,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 ""
 "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
@@ -11435,16 +11425,16 @@
 "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 ""
 "<html>JOSM successfully retrieved a Request Token. JOSM is now launching an "
 "authorisation page in an external browser. Please login with your OSM "
 "username and password and follow the instructions to authorise the Request "
-"Token. Then switch back to this dialogue and click on "
-"<strong>{0}</strong><br><br>If launching the external browser fails you can "
-"copy the following authorise URL and paste it into the address field of your "
-"browser.</html>"
+"Token. Then switch back to this dialogue and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorise URL and paste it into the address field of your browser."
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:275
@@ -11536,14 +11526,14 @@
 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 ""
 "<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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
@@ -11575,11 +11565,11 @@
 #: ../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>"
-msgstr ""
-"<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 ""
+"<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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
@@ -11629,5 +11619,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 "Please select the row to delete."
@@ -11998,6 +11988,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 ""
 "Draw the direction arrows using table lookups instead of complex maths."
@@ -12063,8 +12052,6 @@
 #. antialiasing
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
-msgid ""
-"Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr ""
-"Apply antialiasing to the map view resulting in a smoother appearance."
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr "Apply antialiasing to the map view resulting in a smoother appearance."
 
 #. downloaded area
@@ -12135,5 +12122,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 "Enable built-in defaults"
@@ -12153,6 +12140,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>:"
@@ -12160,6 +12146,6 @@
 "The following plug-in has been downloaded <strong>successfully</strong>:"
 msgstr[1] ""
-"The following {0} plug-ins have been downloaded "
-"<strong>successfully</strong>:"
+"The following {0} plug-ins have been downloaded <strong>successfully</"
+"strong>:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
@@ -12169,6 +12155,5 @@
 "Downloading the following {0} plugins has <strong>failed</strong>:"
 msgstr[0] "Downloading the following plug-in has <strong>failed</strong>:"
-msgstr[1] ""
-"Downloading the following {0} plug-ins has <strong>failed</strong>:"
+msgstr[1] "Downloading the following {0} plug-ins has <strong>failed</strong>:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
@@ -12285,12 +12270,12 @@
 "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 ""
 "<p>Furthermore, the shortcuts are activated when the actions are assigned to "
 "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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:171
@@ -12302,9 +12287,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 ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -12314,9 +12299,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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
@@ -12621,9 +12606,9 @@
 #, java-format
 msgid ""
-"<html>Failed to load the list of style sources "
-"from<br>''{0}''.<br><br>Details (untranslated):<br>{1}</html>"
-msgstr ""
-"<html>Failed to load the list of style sources "
-"from<br>''{0}''.<br><br>Details (untranslated):<br>{1}</html>"
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
@@ -12633,5 +12618,5 @@
 msgstr "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #, java-format
 msgid ""
@@ -12641,18 +12626,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 ""
@@ -12661,5 +12646,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 ""
@@ -12668,5 +12653,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 ""
@@ -12675,9 +12660,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 "Sort presets menu"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
 msgid "Tagging Presets"
 msgstr "Tagging Presets"
@@ -12794,9 +12779,9 @@
 #, 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>"
-msgstr ""
-"<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 ""
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
@@ -12819,10 +12804,10 @@
 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 ""
 "<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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
@@ -12909,8 +12894,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
-msgstr ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgstr "Warning: Failed to retrieve OAuth Access Token from credential manager"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
@@ -12927,8 +12910,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:226
-msgid ""
-"You already have an Access Token to access the OSM server using OAuth."
-msgstr ""
-"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 "You already have an Access Token to access the OSM server using OAuth."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:258
@@ -13024,9 +13005,9 @@
 #: ../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)"
-msgstr ""
-"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 ""
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:256
@@ -13162,4 +13143,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 "Change Properties"
@@ -13341,5 +13323,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
@@ -13363,5 +13345,5 @@
 msgstr "Parsing response from server..."
 
-#: ../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}''"
@@ -13532,6 +13514,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 ""
 "No primitive with id {0} in local dataset. Cannot infer primitive type."
@@ -13653,10 +13634,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 "unexpected format of id replied by the server, got ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:278
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -13665,69 +13646,69 @@
 "unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
 msgid "Creating changeset..."
 msgstr "Creating changeset..."
 
-#: ../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 "Successfully opened changeset {0}"
 
-#: ../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 "Changeset ID > 0 expected. Got {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349
 msgid "Updating changeset..."
 msgstr "Updating changeset..."
 
-#: ../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 "Updating changeset {0}..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:388
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389
 msgid "Closing changeset..."
 msgstr "Closing changeset..."
 
-#: ../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 "No changeset present for diff upload"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
 msgid "Preparing upload request..."
 msgstr "Preparing upload request..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447
 msgid "Waiting 10 seconds ... "
 msgstr "Waiting 10 seconds ... "
 
-#: ../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 "Starting retry {0} of {1} in {2} seconds ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:458
 msgid "OK - trying again."
 msgstr "OK - trying again."
 
-#: ../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 "Starting retry {0} of {1}."
 
-#: ../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 "Current changeset is null. Cannot upload data."
 
-#: ../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 "ID of current changeset > 0 required. Current ID is {0}."
 
-#: ../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}."
@@ -13757,6 +13738,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75
 msgid "Prolog of OsmChange document already written. Please write only once."
-msgstr ""
-"Prolog of OsmChange document already written. Please write only once."
+msgstr "Prolog of OsmChange document already written. Please write only once."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93
@@ -13918,4 +13898,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})"
@@ -13935,9 +13916,9 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error "
-"is:<br>{0}</html>"
-msgstr ""
-"<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 ""
+"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
@@ -13964,9 +13945,9 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
-msgstr ""
-"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 ""
+"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
@@ -13996,6 +13977,5 @@
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
-msgstr ""
-"Found XML element <member> not as direct child of element <relation>."
+msgstr "Found XML element <member> not as direct child of element <relation>."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
@@ -14008,8 +13988,6 @@
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
-msgid ""
-"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
-msgstr ""
-"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 "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
@@ -14478,9 +14456,9 @@
 #, java-format
 msgid ""
-"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is "
-"{2}.<br>You have to update JOSM in order to use this plugin.</html>"
-msgstr ""
-"<html>Plug-in {0} requires JOSM version {1}. The current JOSM version is "
-"{2}.<br>You have to update JOSM in order to use this plug-in.</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 ""
+"<html>Plug-in {0} requires JOSM version {1}. The current JOSM version is {2}."
+"<br>You have to update JOSM in order to use this plug-in.</html>"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
@@ -14680,6 +14658,5 @@
 #, java-format
 msgid "Failed to create plugin information from manifest for plugin ''{0}''"
-msgstr ""
-"Failed to create plug-in information from manifest for plug-in ''{0}''"
+msgstr "Failed to create plug-in information from manifest for plug-in ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:41
@@ -14702,6 +14679,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 ""
 "Warning: Failed to scan file ''{0}'' for plug-in information. Skipping."
@@ -14773,5 +14749,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"
@@ -14875,45 +14851,45 @@
 msgid ""
 "<html>Uploading to the server <strong>failed</strong> because your "
-"current<br>dataset violates a precondition.<br>The error message "
-"is:<br>{0}</html>"
+"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
+"html>"
 msgstr ""
 "<html>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>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:113
 #, 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>"
-msgstr ""
-"<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 ""
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
 #, 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>"
-msgstr ""
-"<html>Authentication at the OSM server with the OAuth token ''{0}'' "
-"failed.<br>Please launch the preferences dialogue 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 ""
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialogue and retrieve another OAuth token."
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:133
 #, 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>"
-msgstr ""
-"<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 dialogue 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 ""
+"<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 dialogue and retrieve another OAuth token."
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
@@ -14932,7 +14908,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 ""
 
@@ -15016,11 +14992,9 @@
 #, 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>"
-msgstr ""
-"<html>The OSM server<br>''{0}''<br>reported an internal server "
-"error.<br>This is most likely a temporary problem. Please try again "
-"later.</html>"
+"<html>The OSM server<br>''{0}''<br>reported an internal server error."
+"<br>This is most likely a temporary problem. Please try again later.</html>"
+msgstr ""
+"<html>The OSM server<br>''{0}''<br>reported an internal server error."
+"<br>This is most likely a temporary problem. Please try again later.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
@@ -15031,11 +15005,11 @@
 #: ../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."
-msgstr ""
-"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 ""
+"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."
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:374
@@ -15073,11 +15047,11 @@
 "<html>The server reports that an object is deleted.<br><strong>Uploading "
 "failed</strong> if you tried to update or delete this object.<br> "
-"<strong>Downloading failed</strong> if you tried to download this "
-"object.<br><br>The error message is:<br>{0}</html>"
+"<strong>Downloading failed</strong> if you tried to download this object."
+"<br><br>The error message is:<br>{0}</html>"
 msgstr ""
 "<html>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>"
 
 #: ../core/src/org/openstreetmap/josm/tools/I18n.java:439
@@ -15508,6 +15482,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1311
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
-msgstr ""
-"Starting and ending numbers must be the same for alphabetic addresses"
+msgstr "Starting and ending numbers must be the same for alphabetic addresses"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1317
@@ -15606,6 +15579,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>"
@@ -15632,6 +15605,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"
@@ -15669,6 +15642,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"
@@ -15684,7 +15657,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"
@@ -15735,9 +15708,29 @@
 msgstr "Numbers:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:134
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#, fuzzy
+msgid "Big buildings mode"
+msgstr "Set buildings size"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#, fuzzy
+msgid "Rotate crosshair"
+msgstr "Rotate right"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#, fuzzy
+msgid "Advanced settings"
+msgstr "Configure advanced settings"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#, fuzzy
+msgid "Building tag:"
+msgstr "Building"
+
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:234
 msgid "Cannot place building outside of the world."
 msgstr "Cannot place building outside of the world."
 
-#: ../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"
@@ -15746,35 +15739,48 @@
 #: ../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 "Set buildings size"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:24
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
 msgid "Use Address dialog"
 msgstr "Use Address dialogue"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#, fuzzy
+msgid "Auto-select building"
+msgstr "Create building"
+
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
 msgid "Buildings width:"
 msgstr "Buildings width:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Length step:"
 msgstr "Length step:"
 
-#: ../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
+#, fuzzy
+msgid "Advanced..."
+msgstr "Advanced"
+
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:65
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 msgid "Draw buildings"
 msgstr "Draw buildings"
 
-#: ../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"
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:379
+#, fuzzy
+msgid "Point on the corner of the building to start drawing"
+msgstr "Point on angle of building to start drawing"
+
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:381
+#, fuzzy
+msgid "Point on opposite end of the building"
 msgstr "Point on opposite end of building"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
-msgid "Set width of building"
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:383
+#, fuzzy
+msgid "Set width of the building"
 msgstr "Set width of building"
 
@@ -15962,7 +15968,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--waterway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15972,5 +15978,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15980,5 +15986,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15994,5 +16000,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -16002,5 +16008,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -16008,8 +16014,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 "water"
@@ -16031,5 +16037,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -16038,5 +16044,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -16045,5 +16051,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -16052,5 +16058,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -16059,5 +16065,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -16066,10 +16072,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 "address"
@@ -16098,19 +16104,17 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
-msgstr ""
-"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 plug-in."
+"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 ""
+"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 plug-in."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98
@@ -16564,6 +16568,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 "Blank Layer"
@@ -16751,4 +16755,52 @@
 msgstr "No GPX data layer found."
 
+#: ../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 "Edit Zoo"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#, fuzzy
+msgid "Name:"
+msgstr "Name"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#, fuzzy
+msgid "CmdLine:"
+msgstr "Coordinates:"
+
+#: ../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
+#, fuzzy, java-format
+msgid "Delete tool \"{0}\"?"
+msgstr "Delete node {0}"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:74
+msgid "Are you sure?"
+msgstr ""
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
+#, fuzzy
+msgid "New tool..."
+msgstr "New role"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
+#, fuzzy
+msgid "Install"
+msgstr "Industrial"
+
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
 msgid "Position only"
@@ -17018,5 +17070,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#. 
+#.
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -17137,8 +17189,6 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
-msgstr ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Maximum number of segments allowed in each generated way. Default 250."
+msgstr "Maximum number of segments allowed in each generated way. Default 250."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
@@ -17160,11 +17210,9 @@
 #: ../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."
-msgstr ""
-"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 ""
+"Accuracy of Douglas-Peucker line simplification, measured in degrees."
+"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
@@ -17449,7 +17497,7 @@
 "new server? (Strongly recommended)</html>"
 msgstr ""
-"<html>The openstreetbugs plug-in is using the old server at "
-"appspot.com.<br>A new server is available at schokokeks.org.<br>Do you want "
-"to switch to the new server? (Strongly recommended)</html>"
+"<html>The openstreetbugs plug-in is using the old server at appspot.com."
+"<br>A new server is available at schokokeks.org.<br>Do you want to switch to "
+"the new server? (Strongly recommended)</html>"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:109
@@ -17476,8 +17524,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-"Header contains several values and cannot be mapped to a single string"
+msgid "Header contains several values and cannot be mapped to a single string"
+msgstr "Header contains several values and cannot be mapped to a single string"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
@@ -17590,6 +17636,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 ""
 "You have unsaved changes in your queue. Do you want to submit them now?"
@@ -17643,6 +17688,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 ""
 "Write position information into the exif header of the following files:"
@@ -18010,5 +18054,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}"
@@ -18059,4 +18103,41 @@
 msgid "Revert changeset #{0}"
 msgstr ""
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:78
+#, fuzzy
+msgid "Road Sign Plugin"
+msgstr "Loading plug-ins"
+
+#: ../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 "Could not read tagging preset source: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
+#, fuzzy, java-format
+msgid "Error parsing tagging preset from ''{0}'':\n"
+msgstr "Parsing plug-in list from site ''{0}''"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:104
+#, fuzzy, java-format
+msgid "Sign {0}"
+msgstr "Selection: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:111
+#, fuzzy, java-format
+msgid "Additional sign {0}"
+msgstr "Add relation {0}"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -18163,4 +18244,15 @@
 msgstr "Enter weight values"
 
+#: ../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 "Simplify Way"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
+#, fuzzy
+msgid "Delete unnecessary nodes from an area."
+msgstr "Delete unnecessary nodes from a way."
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
 msgid "Slippy Map"
@@ -18953,6 +19045,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 ""
 
@@ -19038,8 +19130,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 ""
 
@@ -19093,8 +19185,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 ""
 
@@ -19206,6 +19298,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 ""
 
@@ -19213,6 +19305,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 ""
 
@@ -19856,6 +19948,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
 msgid "Validate that property keys are valid checking against list of words."
-msgstr ""
-"Validate that property keys are valid checking against list of words."
+msgstr "Validate that property keys are valid checking against list of words."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
@@ -19877,11 +19968,9 @@
 #: ../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."
-msgstr ""
-"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 ""
+"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
+"org/index.php/User:JLS/speller) or tag checking data files."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
@@ -20076,9 +20165,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 "area"
@@ -20174,11 +20263,148 @@
 msgstr "{0}, ..."
 
-#: ../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
+#, fuzzy, java-format
+msgid "{0} {1}% of GPS track"
+msgstr "{0} consists of {1} track"
+
+#: ../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 "Import Audio"
+
+#: ../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 "Remove"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
+#, fuzzy
+msgid "removes current video from layer"
+msgstr "Remove photo from layer"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
+#, fuzzy
+msgid "play/pause"
+msgstr "Play/Pause"
+
+#: ../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 "background"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
+#, fuzzy
+msgid "jumps n sec back"
+msgstr "Jump back."
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "forward"
+msgstr "Forwards"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "jumps n sec forward"
+msgstr "Jump forwards"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
+#, fuzzy
+msgid "faster"
+msgstr "Faster"
+
+#: ../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 "Slower"
+
+#: ../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 "Allow adding markers/nodes on current gps positions."
+
+#. 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
+#, fuzzy
+msgid "Jump length"
+msgstr "Jump there"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#, fuzzy
+msgid "Set the length of a jump"
+msgstr "Set the language"
+
+#: ../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
+#, fuzzy
+msgid "Loop length"
+msgstr "Length"
+
+#: ../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
+#, fuzzy
+msgid "deinterlacing using linear interpolation"
+msgstr "Image filter interpolation:"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:99
+#, fuzzy
+msgid "play"
+msgstr "layer"
+
+#: ../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 ""
 
@@ -20411,28 +20637,28 @@
 "This may lead to wrong coordinates."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
 msgid "Automatic downloading"
 msgstr "Automatic downloading"
 
-#: ../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 "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:105
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
 msgid "(deactivated)"
 msgstr "(deactivated)"
 
-#: ../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 "WMS layer ({0}), automatically downloading in zoom {1}"
 
-#: ../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 "WMS layer ({0}), downloading in zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
 #, java-format
 msgid ""
@@ -20447,17 +20673,17 @@
 "tiles anyway?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Yes, fetch images"
 msgstr "Yes, fetch images"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Invalid URL?"
 msgstr "Invalid URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311
 msgid "Download visible tiles"
 msgstr "Download visible tiles"
 
-#: ../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"
@@ -20465,96 +20691,96 @@
 "The requested area is too big. Please zoom in a little, or change resolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329
 msgid "Change resolution"
 msgstr "Change resolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341
 msgid "Reload erroneous tiles"
 msgstr "Reload erroneous tiles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385
 msgid "Save WMS layer to file"
 msgstr "Save WMS layer to file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
 msgid "Save WMS layer"
 msgstr "Save WMS layer"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413
 msgid "Load WMS layer from file"
 msgstr "Load WMS layer from file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
 msgid "Load WMS layer"
 msgstr "Load WMS layer"
 
-#: ../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 "Unsupported WMS file version; found {0}, expected {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
 msgid "File Format Error"
 msgstr "File Format Error"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449
 msgid "Error loading file"
 msgstr "Error loading file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463
 msgid "Set WMS Bookmark"
 msgstr "Set WMS Bookmark"
 
-#: ../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 "Open a blank WMS layer to load data from a file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
 msgid "WMS Plugin Preferences"
 msgstr "WMS Plug-in Preferences"
 
-#: ../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 "Modify list of WMS servers displayed in the WMS plug-in menu"
 
-#: ../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 "Menu Name"
 
-#: ../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 "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "Menu Name (Default)"
 msgstr "Menu Name (Default)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "WMS URL (Default)"
 msgstr "WMS URL (Default)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:86
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
 msgid "Enter a menu name and WMS URL"
 msgstr "Enter a menu name and WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:111
 msgid "Copy Selected Default(s)"
 msgstr "Copy Selected Default(s)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
 msgid "Please select at least one row to copy."
 msgstr "Please select at least one row to copy."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
 msgid "Downloader:"
 msgstr "Downloader:"
@@ -20571,4 +20797,8 @@
 msgid "% of north:"
 msgstr "% of north:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186
+msgid "Simultaneous connections"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -20580,7 +20810,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
@@ -20632,8 +20862,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 "forest"
@@ -20650,7 +20880,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--boundary tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -20660,5 +20890,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -20701,5 +20931,5 @@
 #. color boundary
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -20709,5 +20939,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -20717,5 +20947,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -20725,15 +20955,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 "boundary"
@@ -20749,5 +20979,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -20756,7 +20986,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--route tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -20766,5 +20996,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -20774,5 +21004,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -20782,5 +21012,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -20790,5 +21020,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -20798,5 +21028,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -20806,5 +21036,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -20814,12 +21044,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 "route"
@@ -21108,22 +21338,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:24
-msgid ""
-"Download GPS points from Globalsat dg100 data logger directly in JOSM."
-msgstr ""
-"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 "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 
 #. Plugin graphview
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:28
 msgid "Visualizes routing information as a routing graph."
 msgstr "Visualises routing information as a routing graph."
 
 #. Plugin grid
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:30
 msgid "Provide a background layer that displays a map grid"
 msgstr "Provide a background layer that displays a map grid"
 
 #. 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 "
@@ -21136,10 +21364,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:34
 msgid "Helps vectorizing WMS images."
 msgstr "Helps vectorising WMS images."
 
 #. 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."
@@ -21148,5 +21376,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 "
@@ -21159,15 +21387,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 "Adds no left turn for sets of 4 or 5 ways"
 
 #. 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 "
@@ -21178,5 +21406,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 "
@@ -21189,15 +21417,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:48
 msgid "Displays an OpenLayers background image"
 msgstr "Displays an OpenLayers background image"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:50
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Imports issues from OpenStreetBugs"
 
 #. 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"
@@ -21206,5 +21434,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."
@@ -21213,5 +21441,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 "
@@ -21222,5 +21450,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 "
@@ -21231,10 +21459,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "The great JGoodies Plastic Look and Feel."
 
 #. 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."
@@ -21243,15 +21471,16 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "Let other applications send commands to JOSM."
 msgstr "Let other applications send commands to JOSM."
 
 #. 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 "
@@ -21262,10 +21491,17 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:71
 msgid "Provides routing capabilities."
 msgstr "Provides routing capabilities."
 
+#. 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 "
@@ -21276,15 +21512,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:77
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Allow adding markers/nodes on current gps positions."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:79
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Provides a dialogue for editing tags in a tabular grid."
 
 #. 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 "
@@ -21297,10 +21533,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:83
 msgid "Make terraced houses out of single blocks."
 msgstr "Make terraced houses out of single blocks."
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:85
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21309,5 +21545,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) "
@@ -21318,5 +21554,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:89
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21325,10 +21561,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 "
@@ -21339,5 +21575,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 "
@@ -21347,5 +21583,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:97
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21356,15 +21592,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:99
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Easy downloading along a long set of interconnected ways"
 
 #. 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 "
@@ -21375,5 +21611,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:105
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22264,10 +22500,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 "roundabout"
@@ -22404,8 +22640,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"/>
@@ -22615,5 +22851,5 @@
 #. color motorroad
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -22623,5 +22859,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -22640,5 +22876,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -22648,5 +22884,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -22665,5 +22901,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -22673,5 +22909,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -22690,5 +22926,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -22698,5 +22934,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -22711,5 +22947,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -22727,8 +22963,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 "residential"
@@ -22743,5 +22979,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -22750,5 +22986,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--public_transport tags -->
 #. <rule>
@@ -22758,10 +22994,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 "service"
@@ -22776,5 +23012,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -22783,5 +23019,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -22791,10 +23027,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 "construction"
@@ -23800,9 +24036,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 "marsh"
@@ -24132,5 +24368,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -24140,5 +24376,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -24148,5 +24384,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -24156,5 +24392,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -24164,5 +24400,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -24172,5 +24408,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -24180,5 +24416,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -24189,5 +24425,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -24195,9 +24431,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 "rail"
@@ -25607,5 +25843,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -25615,5 +25851,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -25623,5 +25859,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -25631,5 +25867,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -25993,7 +26229,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--sport tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -26003,5 +26239,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -26011,5 +26247,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -26019,5 +26255,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -26027,5 +26263,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -26035,5 +26271,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -26043,5 +26279,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -26051,5 +26287,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -26059,5 +26295,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -26067,5 +26303,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -26075,5 +26311,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -26083,5 +26319,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -26091,5 +26327,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -26099,5 +26335,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -26107,5 +26343,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -26115,5 +26351,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -26123,5 +26359,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -26131,5 +26367,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -26139,5 +26375,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -26147,5 +26383,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -26155,5 +26391,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -26163,5 +26399,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -26171,5 +26407,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -26179,5 +26415,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -26187,5 +26423,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -26195,5 +26431,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -26203,5 +26439,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -26211,5 +26447,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -26219,5 +26455,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -26227,5 +26463,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -26235,5 +26471,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -26243,5 +26479,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -26251,5 +26487,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -26259,5 +26495,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -26267,5 +26503,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -26275,5 +26511,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -26283,5 +26519,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -26291,5 +26527,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -26299,5 +26535,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -26307,5 +26543,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -26315,5 +26551,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -26323,5 +26559,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -26331,5 +26567,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -26339,5 +26575,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -26347,5 +26583,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -26355,5 +26591,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -26363,33 +26599,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 "sport"
@@ -28067,7 +28303,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--landuse tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -28077,5 +28313,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -28085,5 +28321,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -28093,5 +28329,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -28101,5 +28337,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -28109,5 +28345,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -28117,5 +28353,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -28125,5 +28361,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -28133,12 +28369,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 "green"
@@ -29554,5 +29790,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -29568,5 +29804,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -29576,18 +29812,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 -->
@@ -29596,7 +29849,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- cycleway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -29606,5 +29859,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -29614,5 +29867,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -29622,5 +29875,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -29630,12 +29883,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 "bicycle"
@@ -29662,5 +29916,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -29676,5 +29930,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -29684,5 +29938,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -29691,13 +29945,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"/>
@@ -29708,11 +29970,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 "foot"
@@ -29731,8 +29994,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 "subway"
@@ -29844,9 +30107,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
@@ -29854,5 +30117,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,
@@ -29862,8 +30125,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
@@ -29877,5 +30140,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#. 
+#.
 #: build/trans_style.java:72
 msgid "standard"
@@ -29883,5 +30146,5 @@
 
 #. mappaint style named "standard"
-#. 
+#.
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -29930,6 +30193,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>
@@ -30009,5 +30272,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -30017,16 +30280,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 "deprecated"
@@ -30037,5 +30300,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -30044,5 +30307,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -30051,5 +30314,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -30065,5 +30328,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -30077,5 +30340,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -30084,5 +30347,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -30091,5 +30354,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -30098,5 +30361,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -30105,5 +30368,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -30112,5 +30375,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -30119,5 +30382,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxweight"/>
@@ -30126,5 +30389,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxheight"/>
@@ -30133,5 +30396,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -30140,5 +30403,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxlength"/>
@@ -30147,5 +30410,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -30154,5 +30417,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="minspeed"/>
@@ -30161,5 +30424,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxstay"/>
@@ -30168,5 +30431,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="toll"/>
@@ -30175,5 +30438,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="barrier"/>
@@ -30350,7 +30613,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- highway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -30364,5 +30627,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -30372,7 +30635,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- tracktype tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -30382,5 +30645,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -30390,5 +30653,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -30398,5 +30661,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -30406,10 +30669,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 "highway_track"
@@ -30420,5 +30683,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -30427,5 +30690,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -30435,5 +30698,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -30442,5 +30705,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -30449,5 +30712,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -30456,5 +30719,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -30463,5 +30726,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -30470,5 +30733,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -30477,5 +30740,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -30484,5 +30747,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -30491,5 +30754,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -30498,8 +30761,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 "services"
@@ -30510,8 +30773,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 "ford"
@@ -30522,5 +30785,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -30529,8 +30792,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 "turningcircle"
@@ -30541,9 +30804,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 "emergency_access_point"
@@ -30554,9 +30817,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 "riverbank"
@@ -30567,8 +30830,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 "stream"
@@ -30579,8 +30842,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 "dock"
@@ -30591,5 +30854,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -30598,5 +30861,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -30605,5 +30868,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -30613,5 +30876,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -30620,5 +30883,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -30627,5 +30890,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -30634,5 +30897,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -30642,5 +30905,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -30651,5 +30914,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -30659,7 +30922,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--man_made tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -30669,5 +30932,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -30677,5 +30940,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -30685,5 +30948,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -30694,5 +30957,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -30701,5 +30964,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -30709,5 +30972,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -30717,5 +30980,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -30725,5 +30988,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -30733,5 +30996,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -30741,5 +31004,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -30749,5 +31012,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -30757,5 +31020,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -30765,5 +31028,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -30773,18 +31036,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 "manmade"
@@ -30794,9 +31057,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 "rapids"
@@ -30807,7 +31070,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- railway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -30817,5 +31080,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -30824,5 +31087,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -30832,5 +31095,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -30839,5 +31102,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -30847,5 +31110,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -30855,10 +31118,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 "railwaypoint"
@@ -30869,5 +31132,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -30878,13 +31141,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 "otherrail"
 
 #. color otherrail
-#: build/trans_style.java:1192
+#: build/trans_style.java:1217
 msgid "railover"
 msgstr "railover"
@@ -30895,5 +31158,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -30903,5 +31166,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30914,5 +31177,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30920,7 +31183,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 "oldrail"
@@ -30931,5 +31194,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -30938,5 +31201,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -30945,5 +31208,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -30952,7 +31215,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aeroway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -30963,9 +31226,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 "aeroway"
@@ -30976,8 +31239,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 "terminal"
@@ -30988,5 +31251,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -30996,8 +31259,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 "aeroway_dark"
@@ -31008,8 +31271,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 "aeroway_light"
@@ -31020,5 +31283,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -31027,5 +31290,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -31034,7 +31297,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aerialway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -31044,5 +31307,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -31052,5 +31315,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -31060,5 +31323,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -31068,5 +31331,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -31076,10 +31339,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 "aerialway"
@@ -31090,11 +31353,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 "piste_easy"
@@ -31105,9 +31368,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 "piste_intermediate"
@@ -31118,9 +31381,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 "piste_advanced"
@@ -31131,9 +31394,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 "piste_expert"
@@ -31144,9 +31407,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 "piste_freeride"
@@ -31157,9 +31420,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 "piste_novice"
@@ -31170,7 +31433,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--power tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -31180,5 +31443,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -31187,5 +31450,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -31195,5 +31458,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -31203,5 +31466,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -31211,5 +31474,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -31219,5 +31482,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -31227,5 +31490,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -31235,5 +31498,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -31243,5 +31506,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -31251,5 +31514,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -31259,5 +31522,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -31267,5 +31530,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -31275,15 +31538,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 "power"
@@ -31293,9 +31556,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 "pier"
@@ -31306,8 +31569,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 "pipeline"
@@ -31317,7 +31580,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--leisure tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -31327,5 +31590,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -31335,5 +31598,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -31343,5 +31606,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -31351,5 +31614,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -31359,5 +31622,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -31367,5 +31630,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -31375,5 +31638,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -31383,5 +31646,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -31391,5 +31654,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -31399,5 +31662,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -31407,5 +31670,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -31415,5 +31678,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -31423,5 +31686,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -31431,5 +31694,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -31439,5 +31702,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -31447,17 +31710,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 "leisure"
@@ -31467,9 +31730,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 "marina"
@@ -31479,7 +31742,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--amenity tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -31489,5 +31752,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -31497,5 +31760,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -31505,5 +31768,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -31513,5 +31776,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -31521,5 +31784,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -31529,5 +31792,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -31537,5 +31800,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -31545,5 +31808,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -31553,5 +31816,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -31561,14 +31824,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 "amenity"
@@ -31578,5 +31841,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -31586,5 +31849,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -31594,5 +31857,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -31602,5 +31865,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -31610,5 +31873,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -31618,5 +31881,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -31626,5 +31889,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -31634,5 +31897,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -31642,5 +31905,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -31650,5 +31913,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -31658,5 +31921,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -31666,14 +31929,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 "amenity_traffic"
@@ -31683,5 +31946,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -31690,5 +31953,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -31698,5 +31961,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -31705,5 +31968,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -31713,5 +31976,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -31721,5 +31984,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -31729,5 +31992,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -31736,5 +31999,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -31744,5 +32007,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -31752,5 +32015,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -31760,5 +32023,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -31768,5 +32031,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -31775,5 +32038,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -31782,5 +32045,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -31789,5 +32052,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -31796,5 +32059,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -31803,5 +32066,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -31810,5 +32073,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -31817,5 +32080,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -31824,5 +32087,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -31831,5 +32094,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -31838,5 +32101,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -31845,5 +32108,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -31852,5 +32115,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -31859,5 +32122,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -31867,5 +32130,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -31875,5 +32138,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -31883,5 +32146,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -31891,5 +32154,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -31899,5 +32162,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -31907,5 +32170,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -31915,5 +32178,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -31923,5 +32186,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -31931,5 +32194,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -31940,5 +32203,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -31948,5 +32211,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -31956,5 +32219,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -31964,5 +32227,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -31972,5 +32235,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -31980,5 +32243,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -31988,5 +32251,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -31996,5 +32259,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -32004,5 +32267,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -32012,5 +32275,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -32020,5 +32283,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -32028,5 +32291,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -32036,5 +32299,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -32044,5 +32307,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -32052,5 +32315,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -32060,5 +32323,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"/>
@@ -32068,5 +32339,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -32076,5 +32347,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -32084,5 +32355,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -32092,5 +32363,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -32099,27 +32370,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 "amenity_light"
@@ -32129,5 +32401,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -32137,5 +32409,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -32145,12 +32417,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 "light_water"
@@ -32160,5 +32432,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -32168,5 +32440,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -32176,5 +32448,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -32184,5 +32456,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -32192,5 +32464,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -32200,5 +32472,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -32208,11 +32480,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 "health"
@@ -32222,7 +32494,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--shop tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -32232,5 +32504,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -32240,5 +32512,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -32248,5 +32520,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -32256,5 +32528,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -32264,5 +32536,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -32272,5 +32544,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -32280,5 +32552,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -32288,5 +32560,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -32296,5 +32568,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -32304,5 +32576,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -32312,5 +32584,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -32320,5 +32592,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -32328,5 +32600,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -32336,5 +32608,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -32344,5 +32616,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -32352,5 +32624,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -32360,5 +32632,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -32368,5 +32640,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -32376,5 +32648,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -32384,5 +32656,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -32392,5 +32664,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -32400,5 +32672,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -32408,5 +32680,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -32416,5 +32688,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -32424,5 +32696,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -32432,5 +32704,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -32440,5 +32712,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -32448,5 +32720,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -32456,5 +32728,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -32464,5 +32736,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -32472,5 +32744,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -32480,5 +32752,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -32488,5 +32760,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -32496,5 +32768,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -32504,5 +32776,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -32512,5 +32784,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -32520,5 +32792,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -32528,5 +32800,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -32536,5 +32808,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -32544,5 +32816,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -32552,5 +32824,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -32560,31 +32832,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 "shop"
@@ -32594,7 +32866,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--tourism tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -32604,5 +32876,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -32612,5 +32884,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -32620,5 +32892,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -32628,5 +32900,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -32636,5 +32908,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -32644,5 +32916,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -32652,12 +32924,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 "hotel"
@@ -32667,5 +32939,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -32675,5 +32947,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -32683,5 +32955,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -32691,5 +32963,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -32699,5 +32971,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -32707,5 +32979,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -32716,5 +32988,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -32724,5 +32996,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- information tags -->
 #. <rule>
@@ -32732,5 +33004,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -32740,5 +33012,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -32747,5 +33019,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -32754,13 +33026,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 "tourism"
@@ -32770,7 +33042,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--historic tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -32780,5 +33052,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -32788,5 +33060,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -32796,5 +33068,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -32804,5 +33076,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -32812,5 +33084,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -32820,5 +33092,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -32828,5 +33100,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -32836,5 +33108,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -32844,13 +33116,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 "historic"
@@ -32860,8 +33132,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 "quarry"
@@ -32872,8 +33144,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 "landfill"
@@ -32884,5 +33156,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -32892,8 +33164,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 "basin"
@@ -32904,8 +33176,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 "farmyard"
@@ -32916,6 +33188,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
-#. 
+#.
+#.
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -32925,8 +33197,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 "retail"
@@ -32937,8 +33209,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 "industrial"
@@ -32949,8 +33221,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 "brownfield"
@@ -32961,8 +33233,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 "greenfield"
@@ -32973,8 +33245,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 "railland"
@@ -32985,5 +33257,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -32993,7 +33265,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--military tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -33003,5 +33275,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -33011,5 +33283,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -33019,5 +33291,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -33027,11 +33299,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 "military"
@@ -33042,8 +33314,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 "cemetery"
@@ -33053,8 +33325,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 "peak"
@@ -33065,9 +33337,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 "glacier"
@@ -33077,9 +33349,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 "volcano"
@@ -33089,5 +33361,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -33098,5 +33370,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -33106,5 +33378,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -33114,5 +33386,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -33122,5 +33394,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -33130,12 +33402,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 "natural"
@@ -33145,9 +33417,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 "scrub"
@@ -33157,9 +33429,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 "heath"
@@ -33169,9 +33441,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 "woodarea"
@@ -33181,9 +33453,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 "mud"
@@ -33193,9 +33465,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 "beach"
@@ -33206,5 +33478,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?
@@ -33230,5 +33502,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -33239,11 +33511,11 @@
 #. </rule>
 #. -->
-#. 
+#.
 #. <!--name tags -->
-#. 
+#.
 #. <!--preferences tags -->
-#. 
+#.
 #. <!--place tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -33253,5 +33525,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -33261,5 +33533,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -33269,5 +33541,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -33277,5 +33549,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -33285,5 +33557,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -33293,5 +33565,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -33301,5 +33573,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -33309,5 +33581,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -33317,5 +33589,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -33325,5 +33597,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -33333,5 +33605,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -33341,15 +33613,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 "place"
@@ -33359,9 +33631,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 "tiger_data"
@@ -33452,5 +33724,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#. 
+#.
 #. Data type can be:
 #. node        - a node point
@@ -33458,28 +33730,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
@@ -33594,5 +33866,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#. 
+#.
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -33605,5 +33877,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>
@@ -33628,6 +33900,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#. 
-#. 
+#.
+#.
 #. only for Germany
 #: build/trans_wms.java:17
@@ -33636,6 +33908,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#. 
-#. 
+#.
+#.
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -33650,6 +33922,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
@@ -33663,6 +33935,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
@@ -33682,6 +33954,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#. 
-#. 
+#.
+#.
 #. only for Japan
 #: build/trans_wms.java:39
@@ -33705,6 +33977,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
@@ -33717,16 +33989,24 @@
 msgstr "Sicily - Italy"
 
-#, 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 ""
+#~ "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. "
+
 #~ msgid ""
 #~ "<html>There are {0} primitives in your local dataset which<br>might be "
 #~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
-#~ "to check the state of these primitives<br>on the server.<br>Click "
+#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
+#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
 #~ "<strong>{2}</strong> to ignore.<br></html>"
 #~ msgstr ""
 #~ "<html>There are {0} primitives in your local dataset which<br>might be "
 #~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
-#~ "to check the state of these primitives<br>on the server.<br>Click "
+#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
+#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
 #~ "<strong>{2}</strong> to ignore.<br></html>"
 
@@ -33737,5 +34017,4 @@
 #~ msgstr "Errors during Download"
 
-#, java-format
 #~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
 #~ msgstr "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
@@ -33757,9 +34036,7 @@
 #~ msgstr "More than one \"via\" found."
 
-#, java-format
 #~ msgid "Unknown role ''{0}''."
 #~ msgstr "Unknown role ''{0}''."
 
-#, java-format
 #~ msgid "Unknown member type for ''{0}''."
 #~ msgstr "Unknown member type for ''{0}''."
@@ -33786,21 +34063,16 @@
 #~ msgstr "The \"to\" way does not start or end at the \"via\" way."
 
-#, java-format
 #~ msgid "Style for restriction {0} not found."
 #~ msgstr "Style for restriction {0} not found."
 
-#, java-format
 #~ msgid "Style for inner way ''{0}'' equals multipolygon."
 #~ msgstr "Style for inner way ''{0}'' equals multipolygon."
 
-#, java-format
 #~ msgid "Style for outer way ''{0}'' mismatches."
 #~ msgstr "Style for outer way ''{0}'' mismatches."
 
-#, java-format
 #~ msgid "Error: {0}"
 #~ msgstr "Error: {0}"
 
-#, java-format
 #~ msgid "Warning: {0}"
 #~ msgstr "Warning: {0}"
@@ -33809,5 +34081,4 @@
 #~ msgstr "Gauss-Laborde Réunion 1947"
 
-#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Command Stack: {0}"
@@ -33816,5 +34087,4 @@
 #~ msgstr "Apply also for children"
 
-#, java-format
 #~ msgid "Uploading {0} objects ..."
 #~ msgstr "Uploading {0} objects ..."
@@ -33825,7 +34095,4 @@
 #~ msgid "Create non-audio markers when reading GPX."
 #~ msgstr "Create non-audio markers when reading GPX."
-
-#~ msgid "Point on angle of building to start drawing"
-#~ msgstr "Point on angle of building to start drawing"
 
 #~ msgid ""
Index: /applications/editors/josm/i18n/po/en_GB.po
===================================================================
--- /applications/editors/josm/i18n/po/en_GB.po	(revision 21970)
+++ /applications/editors/josm/i18n/po/en_GB.po	(revision 21971)
@@ -11,5 +11,5 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-15 17:35+0200\n"
+"POT-Creation-Date: 2010-06-23 22:47+0200\n"
 "PO-Revision-Date: 2010-05-16 13:46+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -19,5 +19,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-06-15 16:23+0000\n"
+"X-Launchpad-Export-Date: 2010-06-23 20:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -26,5 +26,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
@@ -96,5 +96,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
@@ -255,5 +255,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
@@ -276,5 +276,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
@@ -282,6 +282,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
@@ -290,4 +292,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
@@ -325,9 +329,9 @@
 #, java-format
 msgid ""
-"<html>There are no layers the source layer<br>''{0}''<br>could be merged "
-"to.</html>"
-msgstr ""
-"<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 ""
+"<html>There are no layers the source layer<br>''{0}''<br>could be merged to."
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:81
@@ -350,9 +354,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
@@ -412,4 +416,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
@@ -449,5 +454,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 "Information"
@@ -661,5 +666,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
@@ -674,5 +679,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 "Delete"
@@ -921,13 +926,14 @@
 #: ../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 ""
 "The selected ways have nodes outside of the downloaded data region."
 msgstr[0] "The selected way has nodes outside of the downloaded data region."
-msgstr[1] ""
-"The selected ways have nodes outside of the downloaded data region."
+msgstr[1] "The selected ways have nodes outside of the downloaded data region."
 
 #: ../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 "This can lead to nodes being deleted accidentally."
@@ -1498,6 +1504,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
@@ -1524,4 +1530,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
@@ -1530,6 +1538,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 "Error"
@@ -1645,6 +1653,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 ""
 "Show status report with useful information that can be attached to bugs"
@@ -1681,8 +1688,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 "Yes, delete nodes"
 
 #: ../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 "Delete nodes outside of downloaded data regions"
@@ -1691,5 +1700,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 "No, abort"
@@ -1697,16 +1707,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 "Cancel operation"
 
 #: ../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 "Do you want to delete them anyway?"
 
 #: ../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 "Delete nodes outside of data regions?"
 
 #: ../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 "Please select at least one way to simplify."
@@ -1715,13 +1730,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 "Yes"
 
 #: ../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 "Simplify all selected ways"
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:126
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:89
 #, java-format
 msgid ""
@@ -1731,8 +1749,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 "Simplify ways?"
 
 #: ../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"
@@ -1742,4 +1762,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)"
@@ -1877,8 +1898,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid ""
-"* One node that is used by more than one way and one of those ways, or"
-msgstr ""
-"* 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 "* One node that is used by more than one way and one of those ways, or"
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
@@ -1949,9 +1968,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)"
@@ -1968,5 +1987,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
@@ -2034,5 +2053,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 "No changes to upload."
@@ -2050,14 +2068,14 @@
 msgstr "Upload all changes in the current selection to the OSM server."
 
-#: ../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 "Checking parents for deleted objects"
 
-#: ../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 "Reading parents of ''{0}''"
 
-#: ../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 "Checking for deleted parents in the local dataset"
@@ -2315,5 +2333,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
@@ -2432,9 +2450,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
 msgid ""
-"Drag play head and release near track to play audio from there; "
-"SHIFT+release to synchronize audio at that point."
-msgstr ""
-"Drag play head and release near track to play audio from there; "
-"SHIFT+release to synchronise 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 ""
+"Drag play head and release near track to play audio from there; SHIFT"
+"+release to synchronise audio at that point."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
@@ -2569,5 +2587,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."
@@ -2690,9 +2708,9 @@
 #: ../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)"
-msgstr ""
-"<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 ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
+"min-max)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
@@ -2862,6 +2880,5 @@
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
-msgstr ""
-"Unknown primitive type: {0}. Allowed values are node, way or relation"
+msgstr "Unknown primitive type: {0}. Allowed values are node, way or relation"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
@@ -2971,10 +2988,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
@@ -3100,5 +3121,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
@@ -3177,11 +3198,11 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231
 msgid ""
-"You are about to delete nodes outside of the area you have "
-"downloaded.<br>This can cause problems because other objects (that you do "
-"not see) might use them.<br>Do you really want to delete?"
-msgstr ""
-"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 ""
+"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?"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
@@ -3226,11 +3247,11 @@
 msgstr[1] "Move {0} nodes"
 
-#: ../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 "Purged object ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111
 #, java-format
 msgid "Purged {0} object"
@@ -3239,5 +3260,5 @@
 msgstr[1] "Purged {0} objects"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 #, java-format
 msgid ""
@@ -3248,5 +3269,5 @@
 "{1}"
 
-#: ../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}"
@@ -3467,9 +3488,9 @@
 #, java-format
 msgid ""
-"<html>Preferences file had errors.<br> Making backup of old one to "
-"<br>{0}<br> and creating a new default preference file.</html>"
-msgstr ""
-"<html>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 ""
+"<html>Preferences file had errors.<br> Making backup of old one to <br>{0}"
+"<br> and creating a new default preference file.</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
@@ -3559,5 +3580,5 @@
 #. *
 #. * the decimal format 999.999
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3566,5 +3587,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3573,5 +3594,5 @@
 #. *
 #. * coordinates East/North
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3622,4 +3643,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}"
@@ -3631,33 +3655,24 @@
 msgstr "Missing merge target for object with id {0}"
 
-#: ../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 "Missing merge target for node with id {0}"
 
-#: ../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 "Missing merge target for relation with id {0}"
 
-#: ../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 "Missing merge target of type {0} with id {1}"
-
-#. 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 ""
-"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. "
 
 #. translators notes must be in front
@@ -3735,19 +3750,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 "A primitive with ID = 0 cannot be invisible."
 
-#: ../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 "ID > 0 expected. Got {0}."
 
-#: ../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 "version > 0 expected. Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:795
 #, java-format
 msgid ""
@@ -3758,5 +3773,5 @@
 "{0}"
 
-#: ../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 "
@@ -3766,5 +3781,5 @@
 "other is not"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1169
 #, java-format
 msgid ""
@@ -3823,8 +3838,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
 #, java-format
-msgid ""
-"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
-msgstr ""
-"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgstr "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
@@ -3838,5 +3851,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 "selected"
@@ -4002,6 +4015,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 ""
 "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
@@ -4073,5 +4085,5 @@
 #. color tiger_data
 #. </rule>
-#. 
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4081,5 +4093,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4088,5 +4100,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4095,5 +4107,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4102,5 +4114,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4109,5 +4121,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4116,9 +4128,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--annotation tags -->
-#. 
+#.
 #. <!--"work in progress" tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="building"/>
@@ -4127,5 +4139,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 "building"
@@ -4212,5 +4224,5 @@
 msgstr "Object deleted"
 
-#: ../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
@@ -4345,6 +4357,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
-msgstr ""
-"Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
+msgstr "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
@@ -4443,5 +4454,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
@@ -4450,4 +4461,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
@@ -4656,5 +4668,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
@@ -4695,11 +4707,11 @@
 "<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 ""
 "<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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
@@ -4729,5 +4741,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"
@@ -4736,5 +4748,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"
@@ -4743,5 +4755,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"
@@ -4967,8 +4979,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566
-msgid ""
-"Copy their selected elements to the end of the list of merged elements."
-msgstr ""
-"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 "Copy their selected elements to the end of the list of merged elements"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:588
@@ -5051,6 +5061,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their "
-"entries.</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 "<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
@@ -5059,9 +5069,9 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their "
-"entries.</html>"
-msgstr ""
-"<html>Click <strong>{0}</strong> to finish merging my and their "
-"entries</html>"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
+"html>"
+msgstr ""
+"<html>Click <strong>{0}</strong> to finish merging my and their entries</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:873
@@ -5113,9 +5123,9 @@
 #, java-format
 msgid ""
-"<html>An error occurred while communicating with the server<br>Details: "
-"{0}</html>"
-msgstr ""
-"<html>An error occurred while communicating with the server<br>Details: "
-"{0}</html>"
+"<html>An error occurred while communicating with the server<br>Details: {0}</"
+"html>"
+msgstr ""
+"<html>An error occurred while communicating with the server<br>Details: {0}</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
@@ -5343,10 +5353,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"
@@ -5355,10 +5367,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
@@ -5440,4 +5454,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 "none"
@@ -5653,6 +5668,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:43
 msgid "<html>Please select the values to keep for the following tags.</html>"
-msgstr ""
-"<html>Please select the values to keep for the following tags.</html>"
+msgstr "<html>Please select the values to keep for the following tags.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:48
@@ -5670,11 +5684,11 @@
 #: ../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>"
-msgstr ""
-"<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 ""
+"<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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
@@ -5698,8 +5712,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:350
-msgid ""
-"Download information about the selected changesets from the OSM server"
-msgstr ""
-"Download information about the selected changesets from the OSM server"
+msgid "Download information about the selected changesets from the OSM server"
+msgstr "Download information about the selected changesets from the OSM server"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:385
@@ -5744,5 +5756,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
@@ -5816,17 +5828,15 @@
 #, 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>"
-msgstr ""
-"<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 ""
+"<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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
@@ -5848,5 +5858,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
@@ -5854,5 +5864,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 "Add"
@@ -5901,5 +5911,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 "History"
@@ -6119,10 +6129,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 "Select in relation list"
 
 #: ../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 "Select relation in relation list."
@@ -6279,6 +6289,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:450
 msgid "Updates the selected changesets with current data from the OSM server"
-msgstr ""
-"Updates the selected changesets with current data from the OSM server"
+msgstr "Updates the selected changesets with current data from the OSM server"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:475
@@ -7612,9 +7621,9 @@
 #, 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>"
-msgstr ""
-"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 ""
+"Please enter a date in the usual format for your locale.<br>Example: {0}"
+"<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1127
@@ -7641,8 +7650,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 ""
 "<html>Please select one the following <strong>standard queries</strong>. "
@@ -7755,6 +7764,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
 msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
-msgstr ""
-"Please enter or paste an URL to retrieve changesets from the OSM API."
+msgstr "Please enter or paste an URL to retrieve changesets from the OSM API."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
@@ -7775,9 +7783,9 @@
 msgstr "This changeset query URL is invalid"
 
-#: ../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 "Add Properties"
 
-#: ../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."
@@ -7786,23 +7794,23 @@
 msgstr[1] "This will change up to {0} objects."
 
-#: ../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 "An empty value deletes the tag."
 
-#: ../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 "<different>"
 
-#: ../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 "Change values?"
 
-#: ../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"
@@ -7811,5 +7819,5 @@
 msgstr[1] "Change properties of up to {0} objects"
 
-#: ../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."
@@ -7818,77 +7826,77 @@
 msgstr[1] "This will change up to {0} objects."
 
-#: ../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 "Please select a key"
 
-#: ../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 "Please select a value"
 
-#: ../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 "Please select the objects you want to change properties for."
 
-#: ../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 "Properties/Memberships"
 
-#: ../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 "Properties for selected objects."
 
 #. 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 "Member Of"
 
-#: ../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 "Properties: {0} / Memberships: {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 "Properties / Memberships"
 
-#: ../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 "Change relation"
 
-#: ../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 "Delete from relation"
 
-#: ../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 "Really delete selection from relation {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 "Delete the selected key in all objects"
 
-#: ../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 "Delete Properties"
 
-#: ../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 "Add a new key/value pair to all objects"
 
-#: ../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 "Edit the value of the selected key for all objects"
 
-#: ../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 "Select relation"
 
-#: ../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 "Select relation in main selection."
@@ -7956,6 +7964,5 @@
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-"Warning: ignoring exception because task is cancelled. Exception: {0}"
+msgstr "Warning: ignoring exception because task is cancelled. Exception: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:93
@@ -8006,10 +8013,10 @@
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
-"relation itself.<br>This creates circular dependencies and is "
-"discouraged.<br>How do you want to proceed with circular dependencies?</html>"
+"relation itself.<br>This creates circular dependencies and is discouraged."
+"<br>How do you want to proceed with circular dependencies?</html>"
 msgstr ""
 "<html>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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
@@ -8026,10 +8033,10 @@
 msgid ""
 "<html>This relation already has one or more members referring to<br>the "
-"primitive ''{0}''<br><br>Do you really want to add another relation "
-"member?</html>"
+"primitive ''{0}''<br><br>Do you really want to add another relation member?</"
+"html>"
 msgstr ""
 "<html>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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612
@@ -8186,6 +8193,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Click to return to the relation editor and to resume relation editing"
-msgstr ""
-"Click to return to the relation editor and to resume relation editing"
+msgstr "Click to return to the relation editor and to resume relation editing"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
@@ -8202,11 +8208,9 @@
 #, java-format
 msgid ""
-"<html>Layer ''{0}'' already has a conflict for "
-"primitive<br>''{1}''.<br>Please resolve this conflict first, then try "
-"again.</html>"
-msgstr ""
-"<html>Layer ''{0}'' already has a conflict for "
-"primitive<br>''{1}''.<br>Please resolve this conflict first, then try "
-"again.</html>"
+"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
+"<br>Please resolve this conflict first, then try again.</html>"
+msgstr ""
+"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
+"<br>Please resolve this conflict first, then try again.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
@@ -8322,6 +8326,5 @@
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-"Warning: ignoring exception because task is cancelled. Exception: {0}"
+msgstr "Warning: ignoring exception because task is cancelled. Exception: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
@@ -8546,11 +8549,9 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is "
-"enabled.<br>Please chose to either download OSM data, or GPX data, or "
-"both.</html>"
-msgstr ""
-"<html>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 ""
+"<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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
@@ -8690,6 +8691,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 ""
 "<html><p class=\"warning-header\">Help content for help topic missing</p><p "
@@ -8698,6 +8699,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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
@@ -8706,11 +8707,11 @@
 "<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 ""
 "<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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355
@@ -8994,18 +8995,16 @@
 "version of one<br>of your nodes, ways, or relations.<br>The conflict is "
 "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click "
-"<strong>{4}</strong> to synchronize the conflicting primitive only.<br>Click "
-"<strong>{5}</strong> to synchronize the entire local dataset with the "
-"server.<br>Click <strong>{6}</strong> to abort and continue "
-"editing.<br></html>"
+"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
+"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
+"strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{6}</strong> to abort and continue editing.<br></html>"
 msgstr ""
 "<html>Uploading <strong>failed</strong> because the server has a newer "
 "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 synchronise the conflicting primitive only.<br>Click "
-"<strong>{5}</strong> to synchronise 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 synchronise the conflicting primitive only.<br>Click <strong>{5}</"
+"strong> to synchronise the entire local dataset with the server.<br>Click "
+"<strong>{6}</strong> to abort and continue editing.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
@@ -9019,14 +9018,12 @@
 msgid ""
 "<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click "
-"<strong>{0}</strong> to synchronize the entire local dataset with the "
-"server.<br>Click <strong>{1}</strong> to abort and continue "
-"editing.<br></html>"
+"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
+"</strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{1}</strong> to abort and continue editing.<br></html>"
 msgstr ""
 "<html>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 synchronise 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 synchronise the entire local dataset with the server.<br>Click "
+"<strong>{1}</strong> to abort and continue editing.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194
@@ -9294,5 +9291,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 "No"
@@ -9300,6 +9297,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 ""
 "Layer ''{0}'' has modifications which should be uploaded to the server."
@@ -9391,6 +9387,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] ""
 "<html>{0} layer needs saving but has no associated file.<br>Either select a "
@@ -9398,6 +9394,6 @@
 msgstr[1] ""
 "<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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
@@ -9409,6 +9405,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 "
@@ -9417,6 +9413,6 @@
 msgstr[0] ""
 "<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>"
 msgstr[1] ""
 "<html>{0} layers need saving but have associated files<br>which cannot be "
@@ -9644,5 +9640,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9672,8 +9668,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:55
-msgid ""
-"The changeset is going to be <strong>closed</strong> after this upload"
-msgstr ""
-"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 "The changeset is going to be <strong>closed</strong> after this upload"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:57
@@ -9738,9 +9732,9 @@
 #, java-format
 msgid ""
-"Uploading <strong>{0} objects</strong> to <strong>multiple "
-"changesets</strong> using <strong>{1} requests</strong>"
-msgstr ""
-"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 ""
+"Uploading <strong>{0} objects</strong> to <strong>multiple changesets</"
+"strong> using <strong>{1} requests</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:67
@@ -9796,7 +9790,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 ""
 "Click ''<strong>{0}</strong>'' to continue uploading to additional new "
@@ -9810,5 +9804,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9826,5 +9820,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..."
@@ -9835,6 +9829,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 ""
 "Ignoring caught exception because upload is cancelled. Exception is: {0}"
@@ -9867,6 +9860,5 @@
 #, java-format
 msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
-msgstr ""
-"Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgstr "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94
@@ -10064,11 +10056,11 @@
 #, 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>"
-msgstr ""
-"<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 ""
+"<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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
@@ -10093,11 +10085,11 @@
 #, 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>"
-msgstr ""
-"<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 ""
+"<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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
@@ -10160,9 +10152,9 @@
 #: ../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:"
-msgstr ""
-"<html>Upload of unprocessed GPS data as map data is considered "
-"harmful.<br>If you want to upload traces, look here:"
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
@@ -10352,9 +10344,9 @@
 #: ../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>"
-msgstr ""
-"<html>Upload of unprocessed GPS data as map data is considered "
-"harmful.<br>If you want to upload traces, look here:</html>"
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:</html>"
+msgstr ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
@@ -10413,11 +10405,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
 msgid ""
-"<html>Take a photo of your GPS receiver while it displays the "
-"time.<br>Display that photo here.<br>And then, simply capture the time you "
-"read on the photo and select a timezone<hr></html>"
-msgstr ""
-"<html>Take a photo of your GPS receiver while it displays the "
-"time.<br>Display that photo here.<br>And then, simply capture the time you "
-"read on the photo and select a timezone<hr></html>"
+"<html>Take a photo of your GPS receiver while it displays the time."
+"<br>Display that photo here.<br>And then, simply capture the time you read "
+"on the photo and select a timezone<hr></html>"
+msgstr ""
+"<html>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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
@@ -10553,6 +10545,5 @@
 "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track.</html>"
 msgstr[0] "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
-msgstr[1] ""
-"<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track.</html>"
+msgstr[1] "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
@@ -11018,11 +11009,11 @@
 "<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 ""
 "<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 authorises the user and retrieves an Access "
-"Token.</html>"
+"fully<br>automatically authorises the user and retrieves an Access Token.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:80
@@ -11050,13 +11041,13 @@
 #: ../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."
-msgstr ""
-"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 ""
+"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."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:111
@@ -11189,10 +11180,10 @@
 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 ""
 "<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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:58
@@ -11310,6 +11301,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 ""
 "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
@@ -11448,16 +11438,16 @@
 "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 ""
 "<html>JOSM successfully retrieved a Request Token. JOSM is now launching an "
 "authorisation page in an external browser. Please login with your OSM "
 "username and password and follow the instructions to authorise the Request "
-"Token. Then switch back to this dialogue and click on "
-"<strong>{0}</strong><br><br>If launching the external browser fails you can "
-"copy the following authorise URL and paste it into the address field of your "
-"browser.</html>"
+"Token. Then switch back to this dialogue and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorise URL and paste it into the address field of your browser."
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:275
@@ -11549,14 +11539,14 @@
 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 ""
 "<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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
@@ -11588,11 +11578,11 @@
 #: ../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>"
-msgstr ""
-"<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 ""
+"<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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
@@ -11642,5 +11632,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 "Please select the row to delete."
@@ -12011,6 +12001,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 ""
 "Draw the direction arrows using table lookups instead of complex maths."
@@ -12076,8 +12065,6 @@
 #. antialiasing
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
-msgid ""
-"Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr ""
-"Apply antialiasing to the map view resulting in a smoother appearance."
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr "Apply antialiasing to the map view resulting in a smoother appearance."
 
 #. downloaded area
@@ -12148,5 +12135,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 "Enable built-in defaults"
@@ -12166,6 +12153,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>:"
@@ -12173,6 +12159,6 @@
 "The following plug-in has been downloaded <strong>successfully</strong>:"
 msgstr[1] ""
-"The following {0} plug-ins have been downloaded "
-"<strong>successfully</strong>:"
+"The following {0} plug-ins have been downloaded <strong>successfully</"
+"strong>:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
@@ -12182,6 +12168,5 @@
 "Downloading the following {0} plugins has <strong>failed</strong>:"
 msgstr[0] "Downloading the following plug-in has <strong>failed</strong>:"
-msgstr[1] ""
-"Downloading the following {0} plug-ins has <strong>failed</strong>:"
+msgstr[1] "Downloading the following {0} plug-ins has <strong>failed</strong>:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
@@ -12298,12 +12283,12 @@
 "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 ""
 "<p>Furthermore, the shortcuts are activated when the actions are assigned to "
 "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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:171
@@ -12315,9 +12300,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 ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -12327,9 +12312,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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
@@ -12634,9 +12619,9 @@
 #, java-format
 msgid ""
-"<html>Failed to load the list of style sources "
-"from<br>''{0}''.<br><br>Details (untranslated):<br>{1}</html>"
-msgstr ""
-"<html>Failed to load the list of style sources "
-"from<br>''{0}''.<br><br>Details (untranslated):<br>{1}</html>"
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
@@ -12646,5 +12631,5 @@
 msgstr "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #, java-format
 msgid ""
@@ -12654,18 +12639,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 ""
@@ -12674,5 +12659,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 ""
@@ -12681,5 +12666,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 ""
@@ -12688,9 +12673,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 "Sort presets menu"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
 msgid "Tagging Presets"
 msgstr "Tagging Presets"
@@ -12807,9 +12792,9 @@
 #, 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>"
-msgstr ""
-"<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 ""
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
@@ -12832,10 +12817,10 @@
 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 ""
 "<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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
@@ -12922,8 +12907,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
-msgstr ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgstr "Warning: Failed to retrieve OAuth Access Token from credential manager"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
@@ -12940,8 +12923,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:226
-msgid ""
-"You already have an Access Token to access the OSM server using OAuth."
-msgstr ""
-"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 "You already have an Access Token to access the OSM server using OAuth."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:258
@@ -13037,9 +13018,9 @@
 #: ../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)"
-msgstr ""
-"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 ""
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:256
@@ -13175,4 +13156,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 "Change Properties"
@@ -13354,5 +13336,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
@@ -13376,5 +13358,5 @@
 msgstr "Parsing response from server..."
 
-#: ../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}''"
@@ -13545,6 +13527,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 ""
 "No primitive with id {0} in local dataset. Cannot infer primitive type."
@@ -13666,10 +13647,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 "unexpected format of id replied by the server, got ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:278
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -13678,69 +13659,69 @@
 "unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
 msgid "Creating changeset..."
 msgstr "Creating changeset..."
 
-#: ../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 "Successfully opened changeset {0}"
 
-#: ../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 "Changeset ID > 0 expected. Got {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349
 msgid "Updating changeset..."
 msgstr "Updating changeset..."
 
-#: ../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 "Updating changeset {0}..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:388
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389
 msgid "Closing changeset..."
 msgstr "Closing changeset..."
 
-#: ../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 "No changeset present for diff upload"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
 msgid "Preparing upload request..."
 msgstr "Preparing upload request..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447
 msgid "Waiting 10 seconds ... "
 msgstr "Waiting 10 seconds ... "
 
-#: ../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 "Starting retry {0} of {1} in {2} seconds ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:458
 msgid "OK - trying again."
 msgstr "OK - trying again."
 
-#: ../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 "Starting retry {0} of {1}."
 
-#: ../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 "Current changeset is null. Cannot upload data."
 
-#: ../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 "ID of current changeset > 0 required. Current ID is {0}."
 
-#: ../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}."
@@ -13770,6 +13751,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75
 msgid "Prolog of OsmChange document already written. Please write only once."
-msgstr ""
-"Prolog of OsmChange document already written. Please write only once."
+msgstr "Prolog of OsmChange document already written. Please write only once."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93
@@ -13931,4 +13911,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})"
@@ -13948,9 +13929,9 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error "
-"is:<br>{0}</html>"
-msgstr ""
-"<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 ""
+"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
@@ -13977,9 +13958,9 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
-msgstr ""
-"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 ""
+"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
@@ -14009,6 +13990,5 @@
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
-msgstr ""
-"Found XML element <member> not as direct child of element <relation>."
+msgstr "Found XML element <member> not as direct child of element <relation>."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
@@ -14021,8 +14001,6 @@
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
-msgid ""
-"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
-msgstr ""
-"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 "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
@@ -14491,9 +14469,9 @@
 #, java-format
 msgid ""
-"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is "
-"{2}.<br>You have to update JOSM in order to use this plugin.</html>"
-msgstr ""
-"<html>Plug-in {0} requires JOSM version {1}. The current JOSM version is "
-"{2}.<br>You have to update JOSM in order to use this plug-in.</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 ""
+"<html>Plug-in {0} requires JOSM version {1}. The current JOSM version is {2}."
+"<br>You have to update JOSM in order to use this plug-in.</html>"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
@@ -14693,6 +14671,5 @@
 #, java-format
 msgid "Failed to create plugin information from manifest for plugin ''{0}''"
-msgstr ""
-"Failed to create plug-in information from manifest for plug-in ''{0}''"
+msgstr "Failed to create plug-in information from manifest for plug-in ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:41
@@ -14715,6 +14692,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 ""
 "Warning: Failed to scan file ''{0}'' for plug-in information. Skipping."
@@ -14786,5 +14762,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"
@@ -14888,45 +14864,45 @@
 msgid ""
 "<html>Uploading to the server <strong>failed</strong> because your "
-"current<br>dataset violates a precondition.<br>The error message "
-"is:<br>{0}</html>"
+"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
+"html>"
 msgstr ""
 "<html>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>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:113
 #, 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>"
-msgstr ""
-"<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 ""
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
 #, 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>"
-msgstr ""
-"<html>Authentication at the OSM server with the OAuth token ''{0}'' "
-"failed.<br>Please launch the preferences dialogue 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 ""
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialogue and retrieve another OAuth token."
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:133
 #, 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>"
-msgstr ""
-"<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 dialogue 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 ""
+"<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 dialogue and retrieve another OAuth token."
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
@@ -14947,12 +14923,12 @@
 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 ""
 "<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>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:212
@@ -15037,11 +15013,9 @@
 #, 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>"
-msgstr ""
-"<html>The OSM server<br>''{0}''<br>reported an internal server "
-"error.<br>This is most likely a temporary problem. Please try again "
-"later.</html>"
+"<html>The OSM server<br>''{0}''<br>reported an internal server error."
+"<br>This is most likely a temporary problem. Please try again later.</html>"
+msgstr ""
+"<html>The OSM server<br>''{0}''<br>reported an internal server error."
+"<br>This is most likely a temporary problem. Please try again later.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
@@ -15052,11 +15026,11 @@
 #: ../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."
-msgstr ""
-"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 ""
+"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."
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:374
@@ -15094,11 +15068,11 @@
 "<html>The server reports that an object is deleted.<br><strong>Uploading "
 "failed</strong> if you tried to update or delete this object.<br> "
-"<strong>Downloading failed</strong> if you tried to download this "
-"object.<br><br>The error message is:<br>{0}</html>"
+"<strong>Downloading failed</strong> if you tried to download this object."
+"<br><br>The error message is:<br>{0}</html>"
 msgstr ""
 "<html>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>"
 
 #: ../core/src/org/openstreetmap/josm/tools/I18n.java:439
@@ -15529,6 +15503,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1311
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
-msgstr ""
-"Starting and ending numbers must be the same for alphabetic addresses"
+msgstr "Starting and ending numbers must be the same for alphabetic addresses"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1317
@@ -15627,6 +15600,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>"
@@ -15653,6 +15626,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"
@@ -15690,6 +15663,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"
@@ -15705,7 +15678,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"
@@ -15756,9 +15729,29 @@
 msgstr "Numbers:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:134
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#, fuzzy
+msgid "Big buildings mode"
+msgstr "Set buildings size"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#, fuzzy
+msgid "Rotate crosshair"
+msgstr "Rotate right"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#, fuzzy
+msgid "Advanced settings"
+msgstr "Configure advanced settings"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#, fuzzy
+msgid "Building tag:"
+msgstr "Building"
+
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:234
 msgid "Cannot place building outside of the world."
 msgstr "Cannot place building outside of the world."
 
-#: ../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"
@@ -15767,35 +15760,48 @@
 #: ../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 "Set buildings size"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:24
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
 msgid "Use Address dialog"
 msgstr "Use Address dialogue"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#, fuzzy
+msgid "Auto-select building"
+msgstr "Create building"
+
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
 msgid "Buildings width:"
 msgstr "Buildings width:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Length step:"
 msgstr "Length step:"
 
-#: ../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
+#, fuzzy
+msgid "Advanced..."
+msgstr "Advanced"
+
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:65
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 msgid "Draw buildings"
 msgstr "Draw buildings"
 
-#: ../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"
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:379
+#, fuzzy
+msgid "Point on the corner of the building to start drawing"
+msgstr "Point on angle of building to start drawing"
+
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:381
+#, fuzzy
+msgid "Point on opposite end of the building"
 msgstr "Point on opposite end of building"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
-msgid "Set width of building"
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:383
+#, fuzzy
+msgid "Set width of the building"
 msgstr "Set width of building"
 
@@ -15985,7 +15991,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--waterway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15995,5 +16001,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -16003,5 +16009,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -16017,5 +16023,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -16025,5 +16031,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -16031,8 +16037,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 "water"
@@ -16054,5 +16060,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -16061,5 +16067,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -16068,5 +16074,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -16075,5 +16081,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -16082,5 +16088,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -16089,10 +16095,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 "address"
@@ -16121,19 +16127,17 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
-msgstr ""
-"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 plug-in."
+"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 ""
+"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 plug-in."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98
@@ -16587,6 +16591,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 "Blank Layer"
@@ -16774,4 +16778,52 @@
 msgstr "No GPX data layer found."
 
+#: ../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 "Edit Zoo"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#, fuzzy
+msgid "Name:"
+msgstr "Name"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#, fuzzy
+msgid "CmdLine:"
+msgstr "Coordinates:"
+
+#: ../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
+#, fuzzy, java-format
+msgid "Delete tool \"{0}\"?"
+msgstr "Delete node {0}"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:74
+msgid "Are you sure?"
+msgstr "Are you sure?"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
+#, fuzzy
+msgid "New tool..."
+msgstr "New role"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
+#, fuzzy
+msgid "Install"
+msgstr "Industrial"
+
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
 msgid "Position only"
@@ -17041,5 +17093,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#. 
+#.
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -17160,8 +17212,6 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
-msgid ""
-"Maximum number of segments allowed in each generated way. Default 250."
-msgstr ""
-"Maximum number of segments allowed in each generated way. Default 250."
+msgid "Maximum number of segments allowed in each generated way. Default 250."
+msgstr "Maximum number of segments allowed in each generated way. Default 250."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
@@ -17183,11 +17233,9 @@
 #: ../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."
-msgstr ""
-"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 ""
+"Accuracy of Douglas-Peucker line simplification, measured in degrees."
+"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
@@ -17472,7 +17520,7 @@
 "new server? (Strongly recommended)</html>"
 msgstr ""
-"<html>The openstreetbugs plug-in is using the old server at "
-"appspot.com.<br>A new server is available at schokokeks.org.<br>Do you want "
-"to switch to the new server? (Strongly recommended)</html>"
+"<html>The openstreetbugs plug-in is using the old server at appspot.com."
+"<br>A new server is available at schokokeks.org.<br>Do you want to switch to "
+"the new server? (Strongly recommended)</html>"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:109
@@ -17499,8 +17547,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-"Header contains several values and cannot be mapped to a single string"
+msgid "Header contains several values and cannot be mapped to a single string"
+msgstr "Header contains several values and cannot be mapped to a single string"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
@@ -17613,6 +17659,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 ""
 "You have unsaved changes in your queue. Do you want to submit them now?"
@@ -17666,6 +17711,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 ""
 "Write position information into the exif header of the following files:"
@@ -18033,5 +18077,5 @@
 msgstr "Revert"
 
-#: ../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}"
@@ -18082,4 +18126,41 @@
 msgid "Revert changeset #{0}"
 msgstr ""
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:78
+#, fuzzy
+msgid "Road Sign Plugin"
+msgstr "Loading plug-ins"
+
+#: ../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 "Could not read tagging preset source: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
+#, fuzzy, java-format
+msgid "Error parsing tagging preset from ''{0}'':\n"
+msgstr "Parsing plug-in list from site ''{0}''"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:104
+#, fuzzy, java-format
+msgid "Sign {0}"
+msgstr "Selection: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:111
+#, fuzzy, java-format
+msgid "Additional sign {0}"
+msgstr "Add relation {0}"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -18185,4 +18266,15 @@
 msgid "Enter weight values"
 msgstr "Enter weight values"
+
+#: ../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 "Simplify Way"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
+#, fuzzy
+msgid "Delete unnecessary nodes from an area."
+msgstr "Delete unnecessary nodes from a way."
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
@@ -18996,6 +19088,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 ""
 
@@ -19081,8 +19173,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 ""
 
@@ -19136,8 +19228,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 ""
 
@@ -19249,6 +19341,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 ""
 
@@ -19256,6 +19348,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 ""
 
@@ -19899,6 +19991,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
 msgid "Validate that property keys are valid checking against list of words."
-msgstr ""
-"Validate that property keys are valid checking against list of words."
+msgstr "Validate that property keys are valid checking against list of words."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
@@ -19920,11 +20011,9 @@
 #: ../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."
-msgstr ""
-"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 ""
+"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
+"org/index.php/User:JLS/speller) or tag checking data files."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
@@ -20119,9 +20208,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 "area"
@@ -20217,11 +20306,148 @@
 msgstr "{0}, ..."
 
-#: ../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
+#, fuzzy, java-format
+msgid "{0} {1}% of GPS track"
+msgstr "{0} consists of {1} track"
+
+#: ../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 "Import Audio"
+
+#: ../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 "Remove"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
+#, fuzzy
+msgid "removes current video from layer"
+msgstr "Remove photo from layer"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
+#, fuzzy
+msgid "play/pause"
+msgstr "Play/Pause"
+
+#: ../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 "background"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
+#, fuzzy
+msgid "jumps n sec back"
+msgstr "Jump back."
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "forward"
+msgstr "Forwards"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "jumps n sec forward"
+msgstr "Jump forwards"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
+#, fuzzy
+msgid "faster"
+msgstr "Faster"
+
+#: ../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 "Slower"
+
+#: ../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 "Allow adding markers/nodes on current gps positions."
+
+#. 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
+#, fuzzy
+msgid "Jump length"
+msgstr "Jump there"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#, fuzzy
+msgid "Set the length of a jump"
+msgstr "Set the language"
+
+#: ../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
+#, fuzzy
+msgid "Loop length"
+msgstr "Length"
+
+#: ../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
+#, fuzzy
+msgid "deinterlacing using linear interpolation"
+msgstr "Image filter interpolation:"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:99
+#, fuzzy
+msgid "play"
+msgstr "layer"
+
+#: ../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 ""
 
@@ -20454,28 +20680,28 @@
 "This may lead to wrong coordinates."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
 msgid "Automatic downloading"
 msgstr "Automatic downloading"
 
-#: ../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 "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:105
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
 msgid "(deactivated)"
 msgstr "(deactivated)"
 
-#: ../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 "WMS layer ({0}), automatically downloading in zoom {1}"
 
-#: ../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 "WMS layer ({0}), downloading in zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
 #, java-format
 msgid ""
@@ -20490,17 +20716,17 @@
 "tiles anyway?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Yes, fetch images"
 msgstr "Yes, fetch images"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Invalid URL?"
 msgstr "Invalid URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311
 msgid "Download visible tiles"
 msgstr "Download visible tiles"
 
-#: ../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"
@@ -20508,96 +20734,96 @@
 "The requested area is too big. Please zoom in a little, or change resolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329
 msgid "Change resolution"
 msgstr "Change resolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341
 msgid "Reload erroneous tiles"
 msgstr "Reload erroneous tiles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385
 msgid "Save WMS layer to file"
 msgstr "Save WMS layer to file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
 msgid "Save WMS layer"
 msgstr "Save WMS layer"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413
 msgid "Load WMS layer from file"
 msgstr "Load WMS layer from file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
 msgid "Load WMS layer"
 msgstr "Load WMS layer"
 
-#: ../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 "Unsupported WMS file version; found {0}, expected {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
 msgid "File Format Error"
 msgstr "File Format Error"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449
 msgid "Error loading file"
 msgstr "Error loading file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463
 msgid "Set WMS Bookmark"
 msgstr "Set WMS Bookmark"
 
-#: ../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 "Open a blank WMS layer to load data from a file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
 msgid "WMS Plugin Preferences"
 msgstr "WMS Plug-in Preferences"
 
-#: ../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 "Modify list of WMS servers displayed in the WMS plug-in menu"
 
-#: ../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 "Menu Name"
 
-#: ../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 "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "Menu Name (Default)"
 msgstr "Menu Name (Default)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "WMS URL (Default)"
 msgstr "WMS URL (Default)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:86
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
 msgid "Enter a menu name and WMS URL"
 msgstr "Enter a menu name and WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:111
 msgid "Copy Selected Default(s)"
 msgstr "Copy Selected Default(s)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
 msgid "Please select at least one row to copy."
 msgstr "Please select at least one row to copy."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
 msgid "Downloader:"
 msgstr "Downloader:"
@@ -20614,4 +20840,8 @@
 msgid "% of north:"
 msgstr "% of north:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186
+msgid "Simultaneous connections"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -20623,7 +20853,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
@@ -20675,8 +20905,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 "forest"
@@ -20693,7 +20923,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--boundary tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -20703,5 +20933,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -20744,5 +20974,5 @@
 #. color boundary
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -20752,5 +20982,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -20760,5 +20990,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -20768,15 +20998,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 "boundary"
@@ -20792,5 +21022,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -20799,7 +21029,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--route tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -20809,5 +21039,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -20817,5 +21047,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -20825,5 +21055,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -20833,5 +21063,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -20841,5 +21071,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -20849,5 +21079,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -20857,12 +21087,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 "route"
@@ -21151,22 +21381,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:24
-msgid ""
-"Download GPS points from Globalsat dg100 data logger directly in JOSM."
-msgstr ""
-"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 "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 
 #. Plugin graphview
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:28
 msgid "Visualizes routing information as a routing graph."
 msgstr "Visualises routing information as a routing graph."
 
 #. Plugin grid
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:30
 msgid "Provide a background layer that displays a map grid"
 msgstr "Provide a background layer that displays a map grid"
 
 #. 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 "
@@ -21179,10 +21407,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:34
 msgid "Helps vectorizing WMS images."
 msgstr "Helps vectorising WMS images."
 
 #. 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."
@@ -21191,5 +21419,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 "
@@ -21202,15 +21430,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 "Adds no left turn for sets of 4 or 5 ways"
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:42
 msgid "Simply convert an area to a multipolygon."
 msgstr "Simply convert an area to a multipolygon."
 
 #. Plugin multipoly
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:44
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -21221,5 +21449,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 "
@@ -21232,15 +21460,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:48
 msgid "Displays an OpenLayers background image"
 msgstr "Displays an OpenLayers background image"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:50
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Imports issues from OpenStreetBugs"
 
 #. 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"
@@ -21249,5 +21477,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."
@@ -21256,5 +21484,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 "
@@ -21265,5 +21493,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 "
@@ -21274,10 +21502,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "The great JGoodies Plastic Look and Feel."
 
 #. 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."
@@ -21286,15 +21514,16 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "Let other applications send commands to JOSM."
 msgstr "Let other applications send commands to JOSM."
 
 #. 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 "
@@ -21305,10 +21534,17 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:71
 msgid "Provides routing capabilities."
 msgstr "Provides routing capabilities."
 
+#. 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 "
@@ -21319,15 +21555,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:77
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Allow adding markers/nodes on current gps positions."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:79
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Provides a dialogue for editing tags in a tabular grid."
 
 #. 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 "
@@ -21340,10 +21576,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:83
 msgid "Make terraced houses out of single blocks."
 msgstr "Make terraced houses out of single blocks."
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:85
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21352,5 +21588,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) "
@@ -21361,5 +21597,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:89
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21370,10 +21606,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 "
@@ -21384,5 +21620,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 "
@@ -21392,5 +21628,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:97
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21401,15 +21637,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:99
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Easy downloading along a long set of interconnected ways"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:101
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Select a sequence of non-branching connected ways"
 
 #. 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 "
@@ -21420,5 +21656,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:105
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22309,10 +22545,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 "roundabout"
@@ -22449,8 +22685,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"/>
@@ -22660,5 +22896,5 @@
 #. color motorroad
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -22668,5 +22904,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -22685,5 +22921,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -22693,5 +22929,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -22710,5 +22946,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -22718,5 +22954,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -22735,5 +22971,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -22743,5 +22979,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -22756,5 +22992,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -22772,8 +23008,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 "residential"
@@ -22788,5 +23024,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -22795,5 +23031,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--public_transport tags -->
 #. <rule>
@@ -22803,10 +23039,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 "service"
@@ -22821,5 +23057,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -22828,5 +23064,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -22836,10 +23072,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 "construction"
@@ -23845,9 +24081,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 "marsh"
@@ -24177,5 +24413,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -24185,5 +24421,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -24193,5 +24429,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -24201,5 +24437,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -24209,5 +24445,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -24217,5 +24453,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -24225,5 +24461,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -24234,5 +24470,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -24240,9 +24476,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 "rail"
@@ -25652,5 +25888,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -25660,5 +25896,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -25668,5 +25904,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -25676,5 +25912,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -26038,7 +26274,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--sport tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -26048,5 +26284,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -26056,5 +26292,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -26064,5 +26300,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -26072,5 +26308,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -26080,5 +26316,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -26088,5 +26324,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -26096,5 +26332,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -26104,5 +26340,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -26112,5 +26348,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -26120,5 +26356,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -26128,5 +26364,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -26136,5 +26372,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -26144,5 +26380,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -26152,5 +26388,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -26160,5 +26396,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -26168,5 +26404,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -26176,5 +26412,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -26184,5 +26420,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -26192,5 +26428,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -26200,5 +26436,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -26208,5 +26444,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -26216,5 +26452,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -26224,5 +26460,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -26232,5 +26468,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -26240,5 +26476,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -26248,5 +26484,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -26256,5 +26492,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -26264,5 +26500,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -26272,5 +26508,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -26280,5 +26516,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -26288,5 +26524,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -26296,5 +26532,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -26304,5 +26540,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -26312,5 +26548,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -26320,5 +26556,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -26328,5 +26564,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -26336,5 +26572,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -26344,5 +26580,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -26352,5 +26588,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -26360,5 +26596,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -26368,5 +26604,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -26376,5 +26612,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -26384,5 +26620,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -26392,5 +26628,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -26400,5 +26636,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -26408,33 +26644,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 "sport"
@@ -28112,7 +28348,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--landuse tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -28122,5 +28358,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -28130,5 +28366,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -28138,5 +28374,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -28146,5 +28382,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -28154,5 +28390,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -28162,5 +28398,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -28170,5 +28406,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -28178,12 +28414,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 "green"
@@ -29599,5 +29835,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -29613,5 +29849,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -29621,18 +29857,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 -->
@@ -29641,7 +29894,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- cycleway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -29651,5 +29904,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -29659,5 +29912,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -29667,5 +29920,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -29675,12 +29928,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 "bicycle"
@@ -29707,5 +29961,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -29721,5 +29975,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -29729,5 +29983,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -29736,13 +29990,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"/>
@@ -29753,11 +30015,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 "foot"
@@ -29776,8 +30039,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 "subway"
@@ -29889,9 +30152,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
@@ -29899,5 +30162,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,
@@ -29907,8 +30170,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
@@ -29922,5 +30185,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#. 
+#.
 #: build/trans_style.java:72
 msgid "standard"
@@ -29928,5 +30191,5 @@
 
 #. mappaint style named "standard"
-#. 
+#.
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -29975,6 +30238,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>
@@ -30054,5 +30317,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -30062,16 +30325,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 "deprecated"
@@ -30082,5 +30345,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -30089,5 +30352,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -30096,5 +30359,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -30110,5 +30373,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -30122,5 +30385,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -30129,5 +30392,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -30136,5 +30399,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -30143,5 +30406,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -30150,5 +30413,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -30157,5 +30420,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -30164,5 +30427,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxweight"/>
@@ -30171,5 +30434,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxheight"/>
@@ -30178,5 +30441,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -30185,5 +30448,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxlength"/>
@@ -30192,5 +30455,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -30199,5 +30462,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="minspeed"/>
@@ -30206,5 +30469,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxstay"/>
@@ -30213,5 +30476,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="toll"/>
@@ -30220,5 +30483,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="barrier"/>
@@ -30395,7 +30658,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- highway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -30409,5 +30672,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -30417,7 +30680,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- tracktype tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -30427,5 +30690,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -30435,5 +30698,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -30443,5 +30706,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -30451,10 +30714,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 "highway_track"
@@ -30465,5 +30728,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -30472,5 +30735,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -30480,5 +30743,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -30487,5 +30750,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -30494,5 +30757,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -30501,5 +30764,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -30508,5 +30771,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -30515,5 +30778,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -30522,5 +30785,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -30529,5 +30792,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -30536,5 +30799,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -30543,8 +30806,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 "services"
@@ -30555,8 +30818,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 "ford"
@@ -30567,5 +30830,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -30574,8 +30837,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 "turningcircle"
@@ -30586,9 +30849,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 "emergency_access_point"
@@ -30599,9 +30862,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 "riverbank"
@@ -30612,8 +30875,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 "stream"
@@ -30624,8 +30887,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 "dock"
@@ -30636,5 +30899,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -30643,5 +30906,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -30650,5 +30913,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -30658,5 +30921,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -30665,5 +30928,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -30672,5 +30935,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -30679,5 +30942,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -30687,5 +30950,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -30696,5 +30959,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -30704,7 +30967,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--man_made tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -30714,5 +30977,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -30722,5 +30985,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -30730,5 +30993,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -30739,5 +31002,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -30746,5 +31009,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -30754,5 +31017,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -30762,5 +31025,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -30770,5 +31033,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -30778,5 +31041,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -30786,5 +31049,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -30794,5 +31057,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -30802,5 +31065,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -30810,5 +31073,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -30818,18 +31081,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 "manmade"
@@ -30839,9 +31102,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 "rapids"
@@ -30852,7 +31115,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- railway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -30862,5 +31125,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -30869,5 +31132,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -30877,5 +31140,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -30884,5 +31147,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -30892,5 +31155,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -30900,10 +31163,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 "railwaypoint"
@@ -30914,5 +31177,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -30923,13 +31186,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 "otherrail"
 
 #. color otherrail
-#: build/trans_style.java:1192
+#: build/trans_style.java:1217
 msgid "railover"
 msgstr "railover"
@@ -30940,5 +31203,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -30948,5 +31211,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30959,5 +31222,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30965,7 +31228,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 "oldrail"
@@ -30976,5 +31239,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -30983,5 +31246,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -30990,5 +31253,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -30997,7 +31260,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aeroway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -31008,9 +31271,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 "aeroway"
@@ -31021,8 +31284,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 "terminal"
@@ -31033,5 +31296,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -31041,8 +31304,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 "aeroway_dark"
@@ -31053,8 +31316,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 "aeroway_light"
@@ -31065,5 +31328,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -31072,5 +31335,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -31079,7 +31342,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aerialway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -31089,5 +31352,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -31097,5 +31360,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -31105,5 +31368,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -31113,5 +31376,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -31121,10 +31384,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 "aerialway"
@@ -31135,11 +31398,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 "piste_easy"
@@ -31150,9 +31413,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 "piste_intermediate"
@@ -31163,9 +31426,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 "piste_advanced"
@@ -31176,9 +31439,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 "piste_expert"
@@ -31189,9 +31452,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 "piste_freeride"
@@ -31202,9 +31465,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 "piste_novice"
@@ -31215,7 +31478,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--power tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -31225,5 +31488,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -31232,5 +31495,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -31240,5 +31503,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -31248,5 +31511,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -31256,5 +31519,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -31264,5 +31527,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -31272,5 +31535,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -31280,5 +31543,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -31288,5 +31551,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -31296,5 +31559,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -31304,5 +31567,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -31312,5 +31575,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -31320,15 +31583,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 "power"
@@ -31338,9 +31601,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 "pier"
@@ -31351,8 +31614,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 "pipeline"
@@ -31362,7 +31625,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--leisure tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -31372,5 +31635,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -31380,5 +31643,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -31388,5 +31651,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -31396,5 +31659,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -31404,5 +31667,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -31412,5 +31675,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -31420,5 +31683,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -31428,5 +31691,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -31436,5 +31699,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -31444,5 +31707,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -31452,5 +31715,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -31460,5 +31723,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -31468,5 +31731,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -31476,5 +31739,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -31484,5 +31747,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -31492,17 +31755,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 "leisure"
@@ -31512,9 +31775,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 "marina"
@@ -31524,7 +31787,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--amenity tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -31534,5 +31797,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -31542,5 +31805,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -31550,5 +31813,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -31558,5 +31821,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -31566,5 +31829,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -31574,5 +31837,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -31582,5 +31845,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -31590,5 +31853,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -31598,5 +31861,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -31606,14 +31869,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 "amenity"
@@ -31623,5 +31886,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -31631,5 +31894,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -31639,5 +31902,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -31647,5 +31910,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -31655,5 +31918,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -31663,5 +31926,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -31671,5 +31934,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -31679,5 +31942,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -31687,5 +31950,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -31695,5 +31958,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -31703,5 +31966,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -31711,14 +31974,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 "amenity_traffic"
@@ -31728,5 +31991,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -31735,5 +31998,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -31743,5 +32006,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -31750,5 +32013,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -31758,5 +32021,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -31766,5 +32029,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -31774,5 +32037,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -31781,5 +32044,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -31789,5 +32052,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -31797,5 +32060,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -31805,5 +32068,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -31813,5 +32076,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -31820,5 +32083,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -31827,5 +32090,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -31834,5 +32097,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -31841,5 +32104,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -31848,5 +32111,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -31855,5 +32118,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -31862,5 +32125,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -31869,5 +32132,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -31876,5 +32139,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -31883,5 +32146,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -31890,5 +32153,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -31897,5 +32160,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -31904,5 +32167,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -31912,5 +32175,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -31920,5 +32183,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -31928,5 +32191,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -31936,5 +32199,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -31944,5 +32207,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -31952,5 +32215,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -31960,5 +32223,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -31968,5 +32231,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -31976,5 +32239,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -31985,5 +32248,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -31993,5 +32256,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -32001,5 +32264,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -32009,5 +32272,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -32017,5 +32280,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -32025,5 +32288,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -32033,5 +32296,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -32041,5 +32304,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -32049,5 +32312,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -32057,5 +32320,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -32065,5 +32328,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -32073,5 +32336,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -32081,5 +32344,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -32089,5 +32352,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -32097,5 +32360,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -32105,5 +32368,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"/>
@@ -32113,5 +32384,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -32121,5 +32392,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -32129,5 +32400,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -32137,5 +32408,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -32144,27 +32415,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 "amenity_light"
@@ -32174,5 +32446,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -32182,5 +32454,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -32190,12 +32462,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 "light_water"
@@ -32205,5 +32477,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -32213,5 +32485,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -32221,5 +32493,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -32229,5 +32501,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -32237,5 +32509,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -32245,5 +32517,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -32253,11 +32525,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 "health"
@@ -32267,7 +32539,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--shop tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -32277,5 +32549,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -32285,5 +32557,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -32293,5 +32565,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -32301,5 +32573,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -32309,5 +32581,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -32317,5 +32589,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -32325,5 +32597,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -32333,5 +32605,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -32341,5 +32613,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -32349,5 +32621,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -32357,5 +32629,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -32365,5 +32637,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -32373,5 +32645,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -32381,5 +32653,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -32389,5 +32661,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -32397,5 +32669,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -32405,5 +32677,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -32413,5 +32685,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -32421,5 +32693,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -32429,5 +32701,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -32437,5 +32709,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -32445,5 +32717,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -32453,5 +32725,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -32461,5 +32733,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -32469,5 +32741,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -32477,5 +32749,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -32485,5 +32757,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -32493,5 +32765,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -32501,5 +32773,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -32509,5 +32781,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -32517,5 +32789,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -32525,5 +32797,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -32533,5 +32805,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -32541,5 +32813,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -32549,5 +32821,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -32557,5 +32829,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -32565,5 +32837,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -32573,5 +32845,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -32581,5 +32853,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -32589,5 +32861,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -32597,5 +32869,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -32605,31 +32877,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 "shop"
@@ -32639,7 +32911,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--tourism tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -32649,5 +32921,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -32657,5 +32929,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -32665,5 +32937,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -32673,5 +32945,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -32681,5 +32953,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -32689,5 +32961,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -32697,12 +32969,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 "hotel"
@@ -32712,5 +32984,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -32720,5 +32992,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -32728,5 +33000,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -32736,5 +33008,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -32744,5 +33016,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -32752,5 +33024,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -32761,5 +33033,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -32769,5 +33041,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- information tags -->
 #. <rule>
@@ -32777,5 +33049,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -32785,5 +33057,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -32792,5 +33064,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -32799,13 +33071,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 "tourism"
@@ -32815,7 +33087,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--historic tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -32825,5 +33097,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -32833,5 +33105,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -32841,5 +33113,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -32849,5 +33121,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -32857,5 +33129,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -32865,5 +33137,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -32873,5 +33145,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -32881,5 +33153,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -32889,13 +33161,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 "historic"
@@ -32905,8 +33177,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 "quarry"
@@ -32917,8 +33189,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 "landfill"
@@ -32929,5 +33201,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -32937,8 +33209,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 "basin"
@@ -32949,8 +33221,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 "farmyard"
@@ -32961,6 +33233,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
-#. 
+#.
+#.
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -32970,8 +33242,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 "retail"
@@ -32982,8 +33254,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 "industrial"
@@ -32994,8 +33266,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 "brownfield"
@@ -33006,8 +33278,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 "greenfield"
@@ -33018,8 +33290,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 "railland"
@@ -33030,5 +33302,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -33038,7 +33310,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--military tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -33048,5 +33320,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -33056,5 +33328,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -33064,5 +33336,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -33072,11 +33344,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 "military"
@@ -33087,8 +33359,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 "cemetery"
@@ -33098,8 +33370,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 "peak"
@@ -33110,9 +33382,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 "glacier"
@@ -33122,9 +33394,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 "volcano"
@@ -33134,5 +33406,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -33143,5 +33415,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -33151,5 +33423,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -33159,5 +33431,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -33167,5 +33439,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -33175,12 +33447,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 "natural"
@@ -33190,9 +33462,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 "scrub"
@@ -33202,9 +33474,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 "heath"
@@ -33214,9 +33486,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 "woodarea"
@@ -33226,9 +33498,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 "mud"
@@ -33238,9 +33510,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 "beach"
@@ -33251,5 +33523,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?
@@ -33275,5 +33547,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -33284,11 +33556,11 @@
 #. </rule>
 #. -->
-#. 
+#.
 #. <!--name tags -->
-#. 
+#.
 #. <!--preferences tags -->
-#. 
+#.
 #. <!--place tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -33298,5 +33570,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -33306,5 +33578,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -33314,5 +33586,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -33322,5 +33594,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -33330,5 +33602,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -33338,5 +33610,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -33346,5 +33618,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -33354,5 +33626,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -33362,5 +33634,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -33370,5 +33642,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -33378,5 +33650,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -33386,15 +33658,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 "place"
@@ -33404,9 +33676,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 "tiger_data"
@@ -33497,5 +33769,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#. 
+#.
 #. Data type can be:
 #. node        - a node point
@@ -33503,28 +33775,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
@@ -33639,5 +33911,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#. 
+#.
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -33650,5 +33922,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>
@@ -33673,6 +33945,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#. 
-#. 
+#.
+#.
 #. only for Germany
 #: build/trans_wms.java:17
@@ -33681,6 +33953,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#. 
-#. 
+#.
+#.
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -33695,6 +33967,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
@@ -33708,6 +33980,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
@@ -33727,6 +33999,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#. 
-#. 
+#.
+#.
 #. only for Japan
 #: build/trans_wms.java:39
@@ -33750,6 +34022,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
@@ -33762,4 +34034,13 @@
 msgstr "Sicily - Italy"
 
+#~ 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 ""
+#~ "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. "
+
 #~ msgid "Move"
 #~ msgstr "Move"
@@ -33783,5 +34064,4 @@
 #~ msgstr "Load Selection"
 
-#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "Contact {0}..."
@@ -33802,9 +34082,7 @@
 #~ msgstr "There were conflicts during import."
 
-#, java-format
 #~ msgid "No time for point {0} x {1}"
 #~ msgstr "No time for point {0} x {1}"
 
-#, java-format
 #~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
 #~ msgstr "Cannot read time \"{0}\" from point {1} x {2}"
@@ -33813,13 +34091,10 @@
 #~ msgstr "No images with readable timestamps found."
 
-#, java-format
 #~ msgid "GPS start: {0}"
 #~ msgstr "GPS start: {0}"
 
-#, java-format
 #~ msgid "GPS end: {0}"
 #~ msgstr "GPS end: {0}"
 
-#, java-format
 #~ msgid "current delta: {0}s"
 #~ msgstr "current delta: {0}s"
@@ -33828,5 +34103,4 @@
 #~ msgstr "timezone difference: "
 
-#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} within the track."
@@ -33835,9 +34109,7 @@
 #~ msgstr "Sync clock"
 
-#, java-format
 #~ msgid "The date in file \"{0}\" could not be parsed."
 #~ msgstr "The date in file \"{0}\" could not be parsed."
 
-#, java-format
 #~ msgid "There is no EXIF time within the file \"{0}\"."
 #~ msgstr "There is no EXIF time within the file \"{0}\"."
@@ -33902,5 +34174,4 @@
 #~ msgstr "to"
 
-#, java-format
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Resolve {0} conflicts in {1} objects"
@@ -33912,5 +34183,4 @@
 #~ msgstr "unnamed"
 
-#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Cannot open preferences directory: {0}"
@@ -33921,5 +34191,4 @@
 #~ msgstr[1] "images"
 
-#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -33934,19 +34203,20 @@
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version selected "
-#~ "in the history list."
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
 #~ msgstr ""
-#~ "Revert the state of all currently selected objects to the version selected "
-#~ "in the history list."
-
-#, java-format
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+
 #~ msgid "Images for {0}"
 #~ msgstr "Images for {0}"
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you load\n"
+#~ "Parameters are read in the order they are specified, so make sure you "
+#~ "load\n"
 #~ "some data before --selection"
 #~ msgstr ""
-#~ "Parameters are read in the order they are specified, so make sure you load\n"
+#~ "Parameters are read in the order they are specified, so make sure you "
+#~ "load\n"
 #~ "some data before --selection"
 
@@ -33954,5 +34224,4 @@
 #~ msgstr "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 
-#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Plugin not found: {0}."
@@ -33999,5 +34268,4 @@
 #~ msgstr "<nd> has zero ref"
 
-#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "Plugin requires JOSM update: {0}."
@@ -34028,9 +34296,7 @@
 #~ msgstr "Download Area"
 
-#, java-format
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "Use preset ''{0}'' of group ''{1}''"
 
-#, java-format
 #~ msgid "Use preset ''{0}''"
 #~ msgstr "Use preset ''{0}''"
@@ -34060,5 +34326,4 @@
 #~ msgstr "Read GPX..."
 
-#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Please report a ticket at {0}"
@@ -34085,5 +34350,4 @@
 #~ msgstr "The base URL for the OSM server (REST API)"
 
-#, java-format
 #~ msgid "Downloaded plugin information from {0} site"
 #~ msgid_plural "Downloaded plugin information from {0} sites"
@@ -34125,9 +34389,9 @@
 
 #~ 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 ""
-#~ "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."
 
 #~ msgid "Set the language."
@@ -34137,5 +34401,4 @@
 #~ msgstr "Open file (as raw gps, if .gpx)"
 
-#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -34147,5 +34410,4 @@
 #~ " {0}"
 
-#, java-format
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
 #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
@@ -34153,5 +34415,4 @@
 #~ msgstr[1] "{0} Plugins successfully updated. Please restart JOSM."
 
-#, java-format
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Could not download plugin: {0} from {1}"
@@ -34164,11 +34425,11 @@
 
 #~ msgid ""
-#~ "You are about to delete nodes outside of the area you have "
-#~ "downloaded.<br>This can cause problems because other objects (that you don't "
-#~ "see) might use them.<br>Do you really want to delete?"
+#~ "You are about to delete nodes outside of the area you have downloaded."
+#~ "<br>This can cause problems because other objects (that you don't see) "
+#~ "might use them.<br>Do you really want to delete?"
 #~ msgstr ""
-#~ "You are about to delete nodes outside of the area you have "
-#~ "downloaded.<br>This can cause problems because other objects, that you don't "
-#~ "see, might be using them.<br>Do you really want to delete?"
+#~ "You are about to delete nodes outside of the area you have downloaded."
+#~ "<br>This can cause problems because other objects, that you don't see, "
+#~ "might be using them.<br>Do you really want to delete?"
 
 #~ msgid "Conflicting relation"
@@ -34181,5 +34442,4 @@
 #~ msgstr "EPSG:4326"
 
-#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Error while loading page {0}"
@@ -34192,9 +34452,9 @@
 
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want to "
-#~ "combine them?"
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
 #~ msgstr ""
-#~ "The selected ways have differing relation memberships.  Do you still want to "
-#~ "combine them?"
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
 
 #~ msgid "Combine ways with different memberships?"
@@ -34208,9 +34468,9 @@
 
 #~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this as "
-#~ "a bug."
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
 #~ msgstr ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this as "
-#~ "a bug."
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
 
 #~ msgid "Expected closing parenthesis."
@@ -34218,9 +34478,9 @@
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still want "
-#~ "to merge them?"
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
 #~ msgstr ""
-#~ "The selected nodes have differing relation memberships.  Do you still want "
-#~ "to merge them?"
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
 
 #~ msgid "Merge nodes with different memberships?"
@@ -34273,7 +34533,4 @@
 #~ msgstr "error requesting update"
 
-#~ msgid "Are you sure?"
-#~ msgstr "Are you sure?"
-
 #~ msgid "AgPifoJ - Geotagged pictures"
 #~ msgstr "AgPifoJ - Geotagged pictures"
@@ -34299,5 +34556,4 @@
 #~ msgstr "Metacarta Map Rectifier image id"
 
-#, java-format
 #~ msgid "rectifier id={0}"
 #~ msgstr "rectifier id={0}"
@@ -34402,12 +34658,14 @@
 #~ msgstr "YAHOO (WebKit GTK+)"
 
-#, java-format
-#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
+#~ msgid ""
+#~ "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them all?"
+#~ "The selection contains {0} ways. Are you sure you want to simplify them "
+#~ "all?"
 #~ msgstr[0] ""
 #~ "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgstr[1] ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them all?"
+#~ "The selection contains {0} ways. Are you sure you want to simplify them "
+#~ "all?"
 
 #~ msgid "Ill-formed node id"
@@ -34421,9 +34679,9 @@
 
 #~ 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 ""
-#~ "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."
 
 #~ msgid ""
@@ -34434,15 +34692,13 @@
 #~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
 
-#, java-format
 #~ msgid "Parsing error in URL: \"{0}\""
 #~ msgstr "Parsing error in URL: \"{0}\""
 
-#, java-format
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "Could not read from URL: \"{0}\""
 
 #~ msgid ""
-#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
-#~ "these will then show up in the WMS menu.\n"
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
 #~ "\n"
 #~ "You can also do this manually in the Advanced Preferences, using the "
@@ -34459,6 +34715,6 @@
 #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
 #~ "only need to input the relevant 'id'.\n"
-#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in "
-#~ "this example,replacing 73 with your image id: \n"
+#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
+#~ "in this example,replacing 73 with your image id: \n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -34467,6 +34723,6 @@
 #~ "use."
 #~ msgstr ""
-#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
-#~ "these will then show up in the WMS menu.\n"
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
 #~ "\n"
 #~ "You can also do this manually in the Advanced Preferences, using the "
@@ -34477,13 +34733,14 @@
 #~ "\n"
 #~ "Full WMS URL input format example (landsat)\n"
-#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&style"
-#~ "s=&srs=EPSG:4326&format=image/jpeg\n"
+#~ "http://onearth.jpl.nasa.gov/wms.cgi?"
+#~ "request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/"
+#~ "jpeg\n"
 #~ "\n"
 #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
 #~ "only need to input the relevant 'id'.\n"
-#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in "
-#~ "this example,replacing 73 with your image id:\n"
-#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73&srs=EPSG:4326&Service=WMS&V"
-#~ "ersion=1.1.0&Request=GetMap&\n"
+#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
+#~ "in this example,replacing 73 with your image id:\n"
+#~ "http://labs.metacarta.com/rectifier/wms.cgi?"
+#~ "id=73&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&\n"
 #~ "format=image/png"
 
@@ -34497,45 +34754,34 @@
 #~ msgstr "Empty member in relation."
 
-#, java-format
 #~ msgid "multipolygon way ''{0}'' is not closed."
 #~ msgstr "multipolygon way ''{0}'' is not closed."
 
-#, java-format
 #~ msgid "No useful role ''{0}'' for Way ''{1}''."
 #~ msgstr "No useful role ''{0}'' for Way ''{1}''."
 
-#, java-format
 #~ msgid "Way ''{0}'' with less than two points."
 #~ msgstr "Way ''{0}'' with less than two points."
 
-#, java-format
 #~ msgid "Style for inner way ''{0}'' equals multipolygon."
 #~ msgstr "Style for inner way ''{0}'' equals multipolygon."
 
-#, java-format
 #~ msgid "Non-Way ''{0}'' in multipolygon."
 #~ msgstr "Non-Way ''{0}'' in multipolygon."
 
-#, java-format
 #~ msgid "No outer way for multipolygon ''{0}''."
 #~ msgstr "No outer way for multipolygon ''{0}''."
 
-#, java-format
 #~ msgid "Intersection between ways ''{0}'' and ''{1}''."
 #~ msgstr "Intersection between ways ''{0}'' and ''{1}''."
 
-#, java-format
 #~ msgid "Inner way ''{0}'' is outside."
 #~ msgstr "Inner way ''{0}'' is outside."
 
-#, java-format
 #~ msgid "Style for outer way ''{0}'' mismatches."
 #~ msgstr "Style for outer way ''{0}'' mismatches."
 
-#, java-format
 #~ msgid "Error: {0}"
 #~ msgstr "Error: {0}"
 
-#, java-format
 #~ msgid "Warning: {0}"
 #~ msgstr "Warning: {0}"
@@ -34580,5 +34826,4 @@
 #~ "Are you really sure to continue?"
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -34594,14 +34839,14 @@
 #~ "Do not upload any data after this message."
 
-#, 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 ""
-#~ "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."
 
 #~ msgid "Upload to OSM..."
 #~ msgstr "Upload to OSM..."
 
-#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -34618,9 +34863,7 @@
 #~ msgstr "Check if map painting found data errors."
 
-#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "Authors: {0}"
 
-#, java-format
 #~ msgid "Layers: {0}"
 #~ msgstr "Layers: {0}"
@@ -34629,5 +34872,4 @@
 #~ msgstr "History of Element"
 
-#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Command Stack: {0}"
@@ -34643,12 +34885,13 @@
 
 #~ msgid "Open the OpenStreetBugs window and activate the automatic download"
-#~ msgstr "Opens the OpenStreetBugs window and activates the automatic download"
+#~ msgstr ""
+#~ "Opens the OpenStreetBugs window and activates the automatic download"
 
 #~ msgid "Please select one or more closed ways of at least four nodes."
 #~ msgstr "Please select one or more closed ways of at least four nodes."
 
-#, java-format
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-#~ msgstr "Skipping a way because it includes a node that doesn''t exist: {0}\n"
+#~ msgstr ""
+#~ "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 
 #~ msgid "Synchronize Time with GPS Unit"
@@ -34661,5 +34904,4 @@
 #~ msgstr "More than one \"from\" way found."
 
-#, java-format
 #~ msgid "Style for restriction {0} not found."
 #~ msgstr "Style for restriction {0} not found."
@@ -34671,9 +34913,7 @@
 #~ msgstr "No \"to\" way found."
 
-#, java-format
 #~ msgid "Unknown role ''{0}''."
 #~ msgstr "Unknown role ''{0}''."
 
-#, java-format
 #~ msgid "Unknown member type for ''{0}''."
 #~ msgstr "Unknown member type for ''{0}''."
@@ -34689,5 +34929,6 @@
 
 #~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
-#~ msgstr "Set manually the Lambert zone (e.g. for locations between two zones)"
+#~ msgstr ""
+#~ "Set manually the Lambert zone (e.g. for locations between two zones)"
 
 #~ msgid "Select Tableau d'Assemblage"
@@ -34703,7 +34944,8 @@
 #~ msgstr "Auto-tag source added:"
 
-#, java-format
-#~ msgid "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
-#~ msgstr "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+#~ msgid ""
+#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
+#~ msgstr ""
+#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 
 #~ msgid "Remove Selected"
@@ -34734,5 +34976,4 @@
 #~ msgstr "Move Down"
 
-#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Relation Editor: {0}"
@@ -34757,5 +34998,4 @@
 #~ "elements have a history."
 
-#, java-format
 #~ msgid "Change the projection to {0} first."
 #~ msgstr "Change the projection to {0} first."
@@ -34764,5 +35004,4 @@
 #~ msgstr "Invalid projection"
 
-#, java-format
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
@@ -34772,5 +35011,4 @@
 #~ "continue?"
 
-#, java-format
 #~ msgid "Found {0} matches of {1} in GPX track {2}"
 #~ msgstr "Found {0} matches of {1} in GPX track {2}"
@@ -34779,5 +35017,4 @@
 #~ msgstr "Default Values"
 
-#, java-format
 #~ msgid "Offset between track and photos: {0}m {1}s"
 #~ msgstr "Offset between track and photos: {0}m {1}s"
@@ -34811,7 +35048,9 @@
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data layer?"
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
 #~ msgstr ""
-#~ "No data to update found. Have you already opened or downloaded a data layer?"
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
 
 #~ msgid "Errors during Download"
@@ -34835,16 +35074,16 @@
 
 #~ msgid ""
-#~ "Tools to work with authors/users. Selects map data that belongs to selected "
-#~ "user, opens browser showing selected author profile page."
+#~ "Tools to work with authors/users. Selects map data that belongs to "
+#~ "selected user, opens browser showing selected author profile page."
 #~ msgstr ""
-#~ "Tools to work with authors/users. Selects map data that belongs to selected "
-#~ "user, opens browser showing selected author profile page."
+#~ "Tools to work with authors/users. Selects map data that belongs to "
+#~ "selected user, opens browser showing selected author profile page."
 
 #~ msgid ""
-#~ "Several utilities that make your life easier: e.g. simplify way, join areas, "
-#~ "jump to position."
+#~ "Several utilities that make your life easier: e.g. simplify way, join "
+#~ "areas, jump to position."
 #~ msgstr ""
-#~ "Several utilities that make your life easier: e.g. simplify way, join areas, "
-#~ "jump to position."
+#~ "Several utilities that make your life easier: e.g. simplify way, join "
+#~ "areas, jump to position."
 
 #~ msgid "Directly load TCX files from JOSM."
@@ -34853,6 +35092,6 @@
 #~ msgid ""
 #~ "The main feature of the plugin is the possibility to delete points of the "
-#~ "GPX track. This plugin can be used to prepare  tracks for uploading to OSM "
-#~ "eg. deleting uninteresting parts of track."
+#~ "GPX track. This plugin can be used to prepare  tracks for uploading to "
+#~ "OSM eg. deleting uninteresting parts of track."
 #~ msgstr ""
 #~ "The main feature of the plugin is the possibility to delete points of the "
@@ -34873,9 +35112,9 @@
 
 #~ msgid ""
-#~ "An error occured while trying to match the photos to the GPX track. You can "
-#~ "adjust the sliders to manually match the photos."
+#~ "An error occured while trying to match the photos to the GPX track. You "
+#~ "can adjust the sliders to manually match the photos."
 #~ msgstr ""
-#~ "An error occurred while trying to match the photos to the GPX track. You can "
-#~ "adjust the sliders to manually match the photos."
+#~ "An error occurred while trying to match the photos to the GPX track. You "
+#~ "can adjust the sliders to manually match the photos."
 
 #~ msgid "Error processing changeset upload response"
@@ -34885,5 +35124,4 @@
 #~ msgstr "Version number missing from OSM data"
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -34907,5 +35145,4 @@
 #~ msgstr "Cannot read numeric value from response"
 
-#, java-format
 #~ msgid "Image with path {0} does not exist or is not readable."
 #~ msgstr "Image with path {0} does not exist or is not readable."
@@ -34917,9 +35154,7 @@
 #~ msgstr "More details"
 
-#, java-format
 #~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
 #~ msgstr "Unexpected \"type\" on member {0} in relation {1}, got {2}."
 
-#, java-format
 #~ msgid "Resolve conflicts in member list of of relation {0}"
 #~ msgstr "Resolve conflicts in member list of relation {0}"
@@ -34928,5 +35163,4 @@
 #~ msgstr "Wrong number of parameters for nodes operator."
 
-#, java-format
 #~ msgid ""
 #~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
@@ -34936,5 +35170,4 @@
 #~ "nodes or range, for example nodes:10-20"
 
-#, java-format
 #~ msgid "Incorrect value of id operator: {0}. Number is expected."
 #~ msgstr "Incorrect value of id operator: {0}. Number is expected."
@@ -34959,5 +35192,4 @@
 #~ msgstr "Apply partial resolutions"
 
-#, java-format
 #~ msgid "Plugin {0} requires JOSM update to version {1}."
 #~ msgstr "Plugin {0} requires JOSM update to version {1}."
@@ -34969,17 +35201,18 @@
 #~ msgstr "Select a starting node on the end of a way"
 
-#, java-format
 #~ msgid ""
-#~ "<html>The OSM primitive with id <strong>{0}</strong> has been deleted<br>on "
-#~ "the server by another mapper.<br><br>Click <strong>{1}</strong> to keep your "
-#~ "primitive and ignore the deleted state.<br>Your primitive will be assigend a "
-#~ "new id.<br>Click <strong>{2}</strong> to accept the state on the server and "
-#~ "to delete your primitive.<br>Click <strong>{3}</strong> to cancel.<br>"
+#~ "<html>The OSM primitive with id <strong>{0}</strong> has been "
+#~ "deleted<br>on the server by another mapper.<br><br>Click <strong>{1}</"
+#~ "strong> to keep your primitive and ignore the deleted state.<br>Your "
+#~ "primitive will be assigend a new id.<br>Click <strong>{2}</strong> to "
+#~ "accept the state on the server and to delete your primitive.<br>Click "
+#~ "<strong>{3}</strong> to cancel.<br>"
 #~ msgstr ""
-#~ "<html>The OSM primitive with id <strong>{0}</strong> has been deleted<br>on "
-#~ "the server by another mapper.<br><br>Click <strong>{1}</strong> to keep your "
-#~ "primitive and ignore the deleted state.<br>Your primitive will be assigned a "
-#~ "new id.<br>Click <strong>{2}</strong> to accept the state on the server and "
-#~ "to delete your primitive.<br>Click <strong>{3}</strong> to cancel.<br>"
+#~ "<html>The OSM primitive with id <strong>{0}</strong> has been "
+#~ "deleted<br>on the server by another mapper.<br><br>Click <strong>{1}</"
+#~ "strong> to keep your primitive and ignore the deleted state.<br>Your "
+#~ "primitive will be assigned a new id.<br>Click <strong>{2}</strong> to "
+#~ "accept the state on the server and to delete your primitive.<br>Click "
+#~ "<strong>{3}</strong> to cancel.<br>"
 
 #~ msgid ""
@@ -34996,5 +35229,4 @@
 #~ "and start a new layer on the new zone."
 
-#, java-format
 #~ msgid "Checking whether node {0} is gone ..."
 #~ msgstr "Checking whether node {0} is gone ..."
@@ -35009,15 +35241,15 @@
 #~ msgstr "Update Selection"
 
-#, java-format
 #~ msgid "Checking whether primitive {0} is gone ..."
 #~ msgstr "Checking whether primitive {0} is gone ..."
 
-#, java-format
 #~ msgid ""
-#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for individual "
-#~ "update. Please reduce the selection<br>to max. {1} primitives.</html>"
+#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
+#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
+#~ "</html>"
 #~ msgstr ""
-#~ "<html>There are <strong>{0}</strong> primitives <br>selected for individual "
-#~ "update. Please reduce the selection<br>to max. {1} primitives.</html>"
+#~ "<html>There are <strong>{0}</strong> primitives <br>selected for "
+#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
+#~ "</html>"
 
 #~ msgid "Selection too big"
@@ -35036,5 +35268,4 @@
 #~ msgstr "Upload to OSM API failed"
 
-#, java-format
 #~ msgid ""
 #~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
@@ -35074,5 +35305,6 @@
 
 #~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
-#~ msgstr "Didn't find an primitive with id {0} and version {1} in this dataset"
+#~ msgstr ""
+#~ "Didn't find an primitive with id {0} and version {1} in this dataset"
 
 #~ msgid "Login name (e-mail) to the OSM account."
@@ -35083,6 +35315,6 @@
 
 #~ msgid ""
-#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
-#~ "these will then show up in the WMS menu.\n"
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
 #~ "\n"
 #~ "You can also do this manually in the Advanced Preferences, using the "
@@ -35098,6 +35330,6 @@
 #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
 #~ "only need to input the relevant 'id'.\n"
-#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in "
-#~ "this example, replacing 73 with your image id:\n"
+#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
+#~ "in this example, replacing 73 with your image id:\n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -35106,6 +35338,6 @@
 #~ "use."
 #~ msgstr ""
-#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
-#~ "these will then show up in the WMS menu.\n"
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
 #~ "\n"
 #~ "You can also do this manually in the Advanced Preferences, using the "
@@ -35121,6 +35353,6 @@
 #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
 #~ "only need to input the relevant 'id'.\n"
-#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in "
-#~ "this example, replacing 73 with your image id:\n"
+#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
+#~ "in this example, replacing 73 with your image id:\n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -35129,5 +35361,4 @@
 #~ "use."
 
-#, java-format
 #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 #~ msgstr "Error header \"{0}\" does not match expected pattern \"{1}\""
@@ -35136,5 +35367,4 @@
 #~ msgstr "Failed to initialise API. Please try again later."
 
-#, java-format
 #~ msgid ""
 #~ "WARNING: launching browser windows for the first {0} of {1} selected "
@@ -35144,5 +35374,4 @@
 #~ "primitives only"
 
-#, java-format
 #~ msgid ""
 #~ "Current number of changes exceeds the max. number of changes, current is "
@@ -35152,19 +35381,17 @@
 #~ "{0}, max is {1}"
 
-#, java-format
 #~ msgid ""
 #~ "<html>There are {0} primitives in your local dataset which<br>might be "
 #~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
-#~ "to check the state of these primitives<br>on the server.<br>Click "
+#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
+#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
 #~ "<strong>{2}</strong> to ignore.<br></html>"
 #~ msgstr ""
 #~ "<html>There are {0} primitives in your local dataset which<br>might be "
 #~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
-#~ "to check the state of these primitives<br>on the server.<br>Click "
+#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
+#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
 #~ "<strong>{2}</strong> to ignore.<br></html>"
 
-#, java-format
 #~ msgid "removing reference from way {0}"
 #~ msgstr "removing reference from way {0}"
@@ -35176,5 +35403,4 @@
 #~ msgstr "Copy defaults"
 
-#, java-format
 #~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
 #~ msgstr "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
@@ -35183,5 +35409,4 @@
 #~ msgstr "Add a new XML source to the list."
 
-#, java-format
 #~ msgid "The XML source (URL or filename) for {0} definition files."
 #~ msgstr "The XML source (URL or filename) for {0} definition files."
@@ -35200,9 +35425,9 @@
 
 #~ msgid ""
-#~ "Enable to upload all changes in one request, disable to use one request per "
-#~ "changed primitive"
+#~ "Enable to upload all changes in one request, disable to use one request "
+#~ "per changed primitive"
 #~ msgstr ""
-#~ "Enable to upload all changes in one request, disable to use one request per "
-#~ "changed primitive"
+#~ "Enable to upload all changes in one request, disable to use one request "
+#~ "per changed primitive"
 
 #~ msgid "Can't search because there is no loaded data."
@@ -35212,5 +35437,4 @@
 #~ msgstr "Gauss-Laborde Réunion 1947"
 
-#, java-format
 #~ msgid ""
 #~ "Warning: failed to bring extended dialog always on top. Exception: {0}"
@@ -35225,16 +35449,14 @@
 #~ "Exception: {0}"
 
-#, java-format
 #~ msgid ""
-#~ "Warning: failed to put ''please wait dialog'' always on top. Exception was: "
-#~ "{0}"
+#~ "Warning: failed to put ''please wait dialog'' always on top. Exception "
+#~ "was: {0}"
 #~ msgstr ""
-#~ "Warning: failed to put ''please wait dialog'' always on top. Exception was: "
-#~ "{0}"
+#~ "Warning: failed to put ''please wait dialog'' always on top. Exception "
+#~ "was: {0}"
 
 #~ msgid "Dialog not created yet. Invoke createInstance() first"
 #~ msgstr "Dialog not created yet. Invoke createInstance() first"
 
-#, java-format
 #~ msgid ""
 #~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
@@ -35248,5 +35470,4 @@
 #~ msgstr "Delete all"
 
-#, java-format
 #~ msgid ""
 #~ "Warning: failed to put properties dialog always on top. Exception was: {0}"
@@ -35254,9 +35475,7 @@
 #~ "Warning: failed to put properties dialog always on top. Exception was: {0}"
 
-#, java-format
 #~ msgid "Deleting layer {0} of {1}"
 #~ msgstr "Deleting layer {0} of {1}"
 
-#, java-format
 #~ msgid ""
 #~ "Warning: failed to put toggle dialog always on top. Exception was: {0}"
@@ -35264,24 +35483,23 @@
 #~ "Warning: failed to put toggle dialog always on top. Exception was: {0}"
 
-#, java-format
 #~ msgid ""
-#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}"
+#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: "
+#~ "{0}"
 #~ msgstr ""
-#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}"
-
-#, java-format
+#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: "
+#~ "{0}"
+
 #~ msgid ""
-#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal to "
-#~ "deleting the roles of these primitives.<br>Do you really want to apply the "
-#~ "new role?</html>"
+#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
+#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
+#~ "the new role?</html>"
 #~ msgstr ""
-#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal to "
-#~ "deleting the roles of these primitives.<br>Do you really want to apply the "
-#~ "new role?</html>"
+#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
+#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
+#~ "the new role?</html>"
 
 #~ msgid "Linked"
 #~ msgstr "Linked"
 
-#, java-format
 #~ msgid ""
 #~ "Warning: failed to put history browser always on top. Exception was: {0}"
@@ -35289,9 +35507,7 @@
 #~ "Warning: failed to put history browser always on top. Exception was: {0}"
 
-#, java-format
 #~ msgid "Expected instance of OsmDataLayer. Got ''{0}''."
 #~ msgstr "Expected instance of OsmDataLayer. Got ''{0}''."
 
-#, java-format
 #~ msgid ""
 #~ "Failed to close changeset {0}, will be closed by server after timeout. "
@@ -35304,5 +35520,4 @@
 #~ msgstr "The plugin could not be removed. Probably it was already disabled"
 
-#, java-format
 #~ msgid ""
 #~ "Loading of {0} plugin was requested. This plugin is no longer required."
@@ -35313,5 +35528,4 @@
 #~ msgstr "INFO: entering compatibilty mode for JOSM with Main.ds"
 
-#, java-format
 #~ msgid "Plug-in named {0} is not available. Update skipped."
 #~ msgstr "Plug-in named {0} is not available. Update skipped."
@@ -35329,5 +35543,4 @@
 #~ "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
 
-#, java-format
 #~ msgid ""
 #~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
@@ -35340,5 +35553,4 @@
 #~ msgstr "Always move and don't show dialogue again"
 
-#, java-format
 #~ msgid ""
 #~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
@@ -35350,5 +35562,4 @@
 #~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
 
-#, java-format
 #~ msgid ""
 #~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
@@ -35358,32 +35569,29 @@
 #~ "relation?</html>"
 
-#, java-format
 #~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-#~ "from relation?</html>"
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
 #~ msgstr ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-#~ "from relation?</html>"
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
 
 #~ msgid ""
-#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
-#~ "the following\n"
+#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to "
+#~ "add the following\n"
 #~ "      Java option to increase the maximum size of allocated memory"
 #~ msgstr ""
-#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
-#~ "the following\n"
+#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to "
+#~ "add the following\n"
 #~ "      Java option to increase the maximum size of allocated memory"
 
-#, java-format
 #~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
 
-#, java-format
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
 #~ msgstr ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
 
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
@@ -35391,27 +35599,22 @@
 
 #~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
 #~ msgstr ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
-
-#, java-format
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+
 #~ msgid "Parameter ''{0}'' must not be null."
 #~ msgstr "parameter ''{0}'' must not be null"
 
-#, java-format
 #~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 #~ msgstr "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 
-#, java-format
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "unexpected return value. Got {0}"
 
-#, java-format
 #~ msgid "Expected ID >= 0. Got {0}."
 #~ msgstr "expected id >= 0. Got {0}"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 #~ msgstr "parameter ''{0}'' is not an acceptable class, got ''{1}''"
@@ -35423,5 +35626,4 @@
 #~ msgstr "There's no version valid at date ''{0}'' in this history"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 #~ msgstr "parameter ''{0}'' in range 0..{1} expected, got {2}"
@@ -35433,25 +35635,19 @@
 #~ msgstr "no latest version found. History is empty."
 
-#, java-format
 #~ msgid "Parameter current out of range. Got {0}."
 #~ msgstr "parameter current out of range: got {0}"
 
-#, java-format
 #~ msgid "Unexpected column index. Got {0}."
 #~ msgstr "unexpected column index. Got {0}"
 
-#, java-format
 #~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
 #~ msgstr "Parameter 'col' must be 0 or 1. Got {0}"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' must not be empty."
 #~ msgstr "parameter ''{0}'' must not be empty"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 #~ msgstr "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
 
-#, java-format
 #~ msgid "Index out of bounds. Got {0}."
 #~ msgstr "index out of bounds Got {0}"
@@ -35460,27 +35656,23 @@
 #~ msgstr "Display the history of the selected primitive"
 
-#, java-format
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Could not read \"{0}\""
 
-#, java-format
 #~ msgid ""
-#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
+#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got "
+#~ "''{1}''."
 #~ msgstr ""
-#~ "illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
-
-#, java-format
+#~ "illegal value for mandatory attribute ''{0}'' of type int (>=0), got "
+#~ "''{1}''"
+
 #~ msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 #~ msgstr "id parameter ''{0}'' > 0 required. Got {1}"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 #~ msgstr "parameter ''{0}'' >= 0 expected, got ''{1}''"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
 #~ msgstr "Parameter ''{0}'' > 0 expected. Got ''{1}''."
 
-#, java-format
 #~ msgid ""
 #~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
@@ -35500,5 +35692,4 @@
 #~ msgstr "Apply also for children"
 
-#, java-format
 #~ msgid ""
 #~ "<html>Failed to create an URL because the encoding ''{0}'' was<br>was "
@@ -35517,13 +35708,10 @@
 #~ "Hold left mousebutton and draw a frame."
 
-#, java-format
 #~ msgid "Value of child.getId() > 0 expected. Got {1}."
 #~ msgstr "Value of child.getId() > 0 expected. Got {1}."
 
-#, java-format
 #~ msgid "Preset group ''{0}'' of group ''{1}''"
 #~ msgstr "Preset group ''{0}'' of group ''{1}''"
 
-#, java-format
 #~ msgid "Exactly four doubles excpected in string, got {0}"
 #~ msgstr "Exactly four doubles expected in string, got {0}"
@@ -35532,17 +35720,14 @@
 #~ msgstr "Wrong number of parameters for tags operator."
 
-#, java-format
 #~ msgid ""
-#~ "Incorrect value of tags operator: {0}. Tags operator expects number of tags "
-#~ "or range, for example tags:1 or tags:2-5"
+#~ "Incorrect value of tags operator: {0}. Tags operator expects number of "
+#~ "tags or range, for example tags:1 or tags:2-5"
 #~ msgstr ""
-#~ "Incorrect value of tags operator: {0}. Tags operator expects number of tags "
-#~ "or range, for example tags:1 or tags:2-5"
-
-#, java-format
+#~ "Incorrect value of tags operator: {0}. Tags operator expects number of "
+#~ "tags or range, for example tags:1 or tags:2-5"
+
 #~ msgid "Incorrect value of changeset operator: {0}. Number is expected."
 #~ msgstr "Incorrect value of changeset operator: {0}. Number is expected."
 
-#, java-format
 #~ msgid "Incorrect value of version operator: {0}. Number is expected."
 #~ msgstr "Incorrect value of version operator: {0}. Number is expected."
@@ -35579,64 +35764,58 @@
 #~ "Click to to return to the relation editor and to resume relation editing"
 
-#, java-format
 #~ msgid ""
-#~ "<html><p class=\"warning-header\">Help content for help topic missing</p><p "
-#~ "class=\"warning-body\">Help content for the help topic <strong>{0}</strong> "
-#~ "is not available yet. It is missing both in your local language ({1}) and in "
-#~ "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>"
+#~ "<html><p class=\"warning-header\">Help content for help topic missing</"
+#~ "p><p class=\"warning-body\">Help content for the help topic <strong>{0}</"
+#~ "strong> is not available yet. It is missing both in your local language "
+#~ "({1}) and in 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>"
 #~ msgstr ""
-#~ "<html><p class=\"warning-header\">Help content for help topic missing</p><p "
-#~ "class=\"warning-body\">Help content for the help topic <strong>{0}</strong> "
-#~ "is not available yet. It is missing both in your local language ({1}) and in "
-#~ "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>"
-
-#, java-format
+#~ "<html><p class=\"warning-header\">Help content for help topic missing</"
+#~ "p><p class=\"warning-body\">Help content for the help topic <strong>{0}</"
+#~ "strong> is not available yet. It is missing both in your local language "
+#~ "({1}) and in 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>"
+
 #~ msgid ""
-#~ "<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-#~ "network problem, please check your<br>your internet connection</html>"
+#~ "<html>Failed to open help page for url {0}.<br>This is most likely due to "
+#~ "a network problem, please check your<br>your internet connection</html>"
 #~ msgstr ""
-#~ "<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-#~ "network problem, please check your<br>your internet connection</html>"
+#~ "<html>Failed to open help page for url {0}.<br>This is most likely due to "
+#~ "a network problem, please check your<br>your internet connection</html>"
 
 #~ msgid "Please enter the password name of your OSM account"
 #~ msgstr "Please enter the password name of your OSM account"
 
-#, java-format
 #~ msgid ""
-#~ "Warning: Failed to retrieve user infos for the current JOSM user. Exceptions "
-#~ "was: {0}"
+#~ "Warning: Failed to retrieve user infos for the current JOSM user. "
+#~ "Exceptions was: {0}"
 #~ msgstr ""
-#~ "Warning: Failed to retrieve user infos for the current JOSM user. Exceptions "
-#~ "was: {0}"
-
-#, java-format
+#~ "Warning: Failed to retrieve user infos for the current JOSM user. "
+#~ "Exceptions was: {0}"
+
 #~ msgid ""
 #~ "The server reported that the current changset was closed.<br>This is most "
-#~ "likely because the changesets size exceeded the max. size<br>of {0} objects "
-#~ "on the server ''{1}''."
+#~ "likely because the changesets size exceeded the max. size<br>of {0} "
+#~ "objects on the server ''{1}''."
 #~ msgstr ""
 #~ "The server reported that the current changset was closed.<br>This is most "
-#~ "likely because the changesets size exceeded the max. size<br>of {0} objects "
-#~ "on the server ''{1}''."
-
-#, java-format
+#~ "likely because the changesets size exceeded the max. size<br>of {0} "
+#~ "objects on the server ''{1}''."
+
 #~ msgid ""
 #~ "Click ''<strong>{0}</strong>'' to continue uploading to additional new "
 #~ "changsets.<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>"
+#~ "dialog.<br>Click ''<strong>{2}</strong>'' to abort uploading and return "
+#~ "to map editing.<br>"
 #~ msgstr ""
 #~ "Click ''<strong>{0}</strong>'' to continue uploading to additional new "
 #~ "changsets.<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>"
-
-#, java-format
+#~ "dialog.<br>Click ''<strong>{2}</strong>'' to abort uploading and return "
+#~ "to map editing.<br>"
+
 #~ msgid "Uploading {0} objects ..."
 #~ msgstr "Uploading {0} objects ..."
@@ -35645,13 +35824,11 @@
 #~ msgstr "GPS point"
 
-#, java-format
 #~ msgid ""
-#~ "Warning: ignoring changeset id {0} for new object with external id {1} and "
-#~ "internal id {2}"
+#~ "Warning: ignoring changeset id {0} for new object with external id {1} "
+#~ "and internal id {2}"
 #~ msgstr ""
-#~ "Warning: ignoring changeset id {0} for new object with external id {1} and "
-#~ "internal id {2}"
-
-#, java-format
+#~ "Warning: ignoring changeset id {0} for new object with external id {1} "
+#~ "and internal id {2}"
+
 #~ msgid ""
 #~ "Unknown relation member type ''{0}'' in relation with external id ''{1}''."
@@ -35681,5 +35858,4 @@
 #~ msgstr "<html>Cannot open directory.<br>Please select a file!</html>"
 
-#, java-format
 #~ msgid "Node {0} cannot be added to the way because it was deleted"
 #~ msgstr "Node {0} cannot be added to the way because it was deleted"
@@ -35687,7 +35863,4 @@
 #~ msgid "Error: "
 #~ msgstr "Error: "
-
-#~ msgid "Point on angle of building to start drawing"
-#~ msgstr "Point on angle of building to start drawing"
 
 #~ msgid ""
Index: /applications/editors/josm/i18n/po/es.po
===================================================================
--- /applications/editors/josm/i18n/po/es.po	(revision 21970)
+++ /applications/editors/josm/i18n/po/es.po	(revision 21971)
@@ -8,7 +8,7 @@
 "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-14 13:32+0000\n"
-"Last-Translator: Emilio Gomez Fernandez <Unknown>\n"
+"POT-Creation-Date: 2010-06-23 22:47+0200\n"
+"PO-Revision-Date: 2010-06-22 23:12+0000\n"
+"Last-Translator: mariomx08 <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-06-15 16:22+0000\n"
+"X-Launchpad-Export-Date: 2010-06-23 20:25+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -23,5 +23,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
@@ -36,5 +36,5 @@
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
-msgstr "Ignorando URL de archivo malformado: \"{0}\""
+msgstr "Ignorando archivo malformado de URL: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:438
@@ -93,9 +93,9 @@
 #: ../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
 msgid "Warning"
-msgstr "Aviso"
+msgstr "Precaucion"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:470
@@ -197,7 +197,7 @@
 "page for OSM primitive will probably fail. API base URL is: ''{0}''"
 msgstr ""
-"Atención: formato inesperado para la URL base de la API. La redirección "
-"hacia la página de Información o de Históricos es probable que falle. La URL "
-"base de la API es: ''{0}''"
+"Precaución: formato inesperado de la URL de la base API. La redirección "
+"hacia la página para información o historial para OSM primitivo "
+"probablemente falle. La URL de la base API es:\"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63
@@ -207,7 +207,7 @@
 "user will probably fail. API base URL is: ''{0}''"
 msgstr ""
-"Atención: formato inesperado para la URL base de la API. La redirección "
-"hacia las páginas de usuario OSM es probable que falle. La URL base de la "
-"API es: ''{0}''"
+"Precaución: formato inesperado de la URL de la base API. La redirección "
+"hacia la página de usuario OSM probablemente fallará. La URL de la base API "
+"es:\"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86
@@ -217,6 +217,6 @@
 "screen with browser windows<br>and take some time to finish."
 msgstr ""
-"Está a punto de lanzar {0} ventanas de navegador. <br> Esto puede abarrotar "
-"la pantalla con ventanas y llevar bastante tiempo en terminar."
+"Está por lanzar {0} ventanas del navegador.<br> Esto puede saturar su "
+"pantalla con ventanas del navegador<br> y tomar algo de tiempo para terminar."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
@@ -255,5 +255,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
@@ -276,5 +276,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
@@ -282,6 +282,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
@@ -290,4 +292,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
@@ -325,6 +329,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 ""
 "<html>No hay capas a las que pueda unirse la capa fuente <br>\"{0}\"</html>"
@@ -332,5 +336,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:81
 msgid "No target layers"
-msgstr "Ninguna capas de objetivo"
+msgstr "No hay capas objetivo"
 
 #. modal
@@ -343,5 +347,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25
 msgid "Add a node by entering latitude and longitude."
-msgstr "Añadir nodo entrando latitud y longitud."
+msgstr "Añadir capa informando latitud y longitud"
 
 #. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
@@ -349,9 +353,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
@@ -411,4 +415,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
@@ -424,5 +429,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 msgid "Please select at least four nodes."
-msgstr "Por favor, selecciona al menos cuatro nodos."
+msgstr "Por favor seleccione al menos cuatro nodos."
 
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140
@@ -448,5 +453,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 "Información"
@@ -500,5 +505,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210
 msgid "Nothing selected to zoom to."
-msgstr "Nada seleccionado a lo que hacer zoom"
+msgstr "Nada seleccionado para realizar zoom"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120
@@ -523,9 +528,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210
 msgid "No conflicts to zoom to"
-msgstr "No existen conflictos a los que hacer zoom"
+msgstr "No hay conflictos para realizar zoom"
 
 #: ../core/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java:32
 msgid "Changeset Manager"
-msgstr "Gestor de conjuntos de cambios"
+msgstr "Administrador de cambios"
 
 #: ../core/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java:34
@@ -614,5 +619,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
 msgid "Please select at least two ways to combine."
-msgstr "Por favor, selecciona al menos dos vías para combinar."
+msgstr "Por favor seleccione al menos dos vías a combinar"
 
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
@@ -636,5 +641,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
 msgid "Create Circle"
-msgstr "Crear círculo"
+msgstr "Crear un círculo"
 
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
@@ -660,5 +665,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
@@ -673,5 +678,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 "Borrar"
@@ -928,4 +933,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 ""
@@ -938,4 +944,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 "Esto puede llevar a un borrado accidental de nodos"
@@ -1314,7 +1321,7 @@
 "todos los ángulos son de 90 ó 180 grados.</h3>Puede añadir dos nodos a la "
 "selección. Entonces se fija la dirección en función de esos dos nodos de "
-"referencia. (Después puede deshacer el movimiento para algunos "
-"nodos:<br>Elíjalos y pulse el atajo de Ortogonalizar / Deshacer. Por defecto "
-"éste es Shift-Q.)"
+"referencia. (Después puede deshacer el movimiento para algunos nodos:"
+"<br>Elíjalos y pulse el atajo de Ortogonalizar / Deshacer. Por defecto éste "
+"es Shift-Q.)"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45
@@ -1363,6 +1370,6 @@
 "<html>Está usando el proyecto EPSG:4326 el cual podría dar lugar<br> a "
 "indeseables resultados cuando haga alineamientos rectangulares.<br>Cambie su "
-"proyección para conseguir eliminar esta advertencia.<br>¿Desea "
-"continuar?</html>"
+"proyección para conseguir eliminar esta advertencia.<br>¿Desea continuar?</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:148
@@ -1520,6 +1527,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
@@ -1546,4 +1553,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
@@ -1552,6 +1561,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 "Error"
@@ -1667,6 +1676,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 ""
 "Mostrar informe de situación con información útil que se puede asociar a los "
@@ -1704,8 +1712,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 "Sí, eliminar nodos"
 
 #: ../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 "Nodos borrados fuera de las regiones de datos descargados"
@@ -1714,5 +1724,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 "No, abortar"
@@ -1720,16 +1731,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 "Cancelar operación"
 
 #: ../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 "¿Quiere borrarlos de todos modos?"
 
 #: ../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 "¿Borrar nodos fuera de las regiones de los datos?"
 
 #: ../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 "Por favor, seleccione al menos una para simplificar."
@@ -1738,13 +1754,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 "Si"
 
 #: ../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 "Simplificar todas las vías seleccionadas"
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:126
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:89
 #, java-format
 msgid ""
@@ -1755,8 +1774,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 "¿Simplificar vías?"
 
 #: ../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"
@@ -1766,4 +1787,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)"
@@ -1901,6 +1923,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 "* Un nodo usado por más de una vía y una de esas vías, o"
 
@@ -1970,9 +1991,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)"
@@ -1989,5 +2010,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
@@ -2053,11 +2074,10 @@
 "''{0}''.<br>You have to resolve them first.</html>"
 msgstr ""
-"<html>Los datos a subir aparecen en conflictos no resueltos de la capa "
-"\"{0}\". <br>Debe resolverlos primero.</html>"
+"<html>Los datos a subir aparecen en conflictos no resueltos de la capa \"{0}"
+"\". <br>Debe resolverlos primero.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:153
 #: ../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 "Ningún cambio que subir"
@@ -2075,14 +2095,14 @@
 msgstr "Cargar todos los cambios en la selección actual al servidor de OSM."
 
-#: ../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 "Verificando padres para los objetos borrados"
 
-#: ../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 "Leyendo padres de ''{0}''"
 
-#: ../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 "Comprobando los padres suprimidos en el conjunto de datos locales"
@@ -2344,5 +2364,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
@@ -2463,6 +2483,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 ""
 "Desplace la flecha de reproducción y suéltela cerca de la traza para "
@@ -2603,5 +2623,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."
@@ -2650,11 +2670,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
-msgstr ""
-"<b>Calle Mayor</b> - ''Calle'' y ''Mayor'' en cualquier clave o valor."
+msgstr "<b>Calle Mayor</b> - ''Calle'' y ''Mayor'' en cualquier clave o valor."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
-msgstr ""
-"<b>\"Calle Mayor\"</b> - ''Calle Mayor'' en cualquier clave o nombre."
+msgstr "<b>\"Calle Mayor\"</b> - ''Calle Mayor'' en cualquier clave o nombre."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
@@ -2709,6 +2727,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
-msgstr ""
-"<b>id:</b>... - objecto con el ID indicado (0 para los objetos nuevos)"
+msgstr "<b>id:</b>... - objecto con el ID indicado (0 para los objetos nuevos)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
@@ -2730,9 +2747,9 @@
 #: ../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)"
-msgstr ""
-"<b>nodos:</b>... - objeto con el número de nodos dado (nodos: conteo o "
-"nodos:min-max)"
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
+"min-max)"
+msgstr ""
+"<b>nodos:</b>... - objeto con el número de nodos dado (nodos: conteo o nodos:"
+"min-max)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
@@ -2741,6 +2758,6 @@
 "max)"
 msgstr ""
-"<b>tags:</b>...  - objeto con un número dado de etiquetas (tags:total o "
-"tags:min-max)"
+"<b>tags:</b>...  - objeto con un número dado de etiquetas (tags:total o tags:"
+"min-max)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
@@ -2991,7 +3008,7 @@
 "dependency.</html>"
 msgstr ""
-"<html>Las relaciones {0} son cíclicas (cada una se refiere a la "
-"otra)<br>JOSM no puede subirlas al servidor. Por favor: edite las relaciones "
-"y elimine la dependencia cíclica.</html>"
+"<html>Las relaciones {0} son cíclicas (cada una se refiere a la otra)"
+"<br>JOSM no puede subirlas al servidor. Por favor: edite las relaciones y "
+"elimine la dependencia cíclica.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
@@ -3022,10 +3039,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
@@ -3128,6 +3149,6 @@
 "conflict cannot be added.</html>"
 msgstr ""
-"<html>La capa ''{0}'' ya tiene un conflicto con la primitiva "
-"<br>''{1}''.<br>Este conflicto no puede ser añadido.</html>"
+"<html>La capa ''{0}'' ya tiene un conflicto con la primitiva <br>''{1}''."
+"<br>Este conflicto no puede ser añadido.</html>"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36
@@ -3151,5 +3172,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
@@ -3230,7 +3251,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 ""
 "Está a punto de borrar nodos fuera del área que se ha descargado.<br>Esto "
@@ -3279,11 +3300,11 @@
 msgstr[1] "Mover {0} nodos"
 
-#: ../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 "Eliminado objeto ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111
 #, java-format
 msgid "Purged {0} object"
@@ -3292,5 +3313,5 @@
 msgstr[1] "Purgados {0} objetos"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 #, java-format
 msgid ""
@@ -3301,5 +3322,5 @@
 "debajo de 2. El actual es {1}"
 
-#: ../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}"
@@ -3522,6 +3543,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 ""
 "<html>El archivo de preferencias contiene errores.<br> Realizando una copia "
@@ -3541,6 +3562,5 @@
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-"Error: Línea ''{0}'' inesperada en el archivo de marcapáginas ''{1}''"
+msgstr "Error: Línea ''{0}'' inesperada en el archivo de marcapáginas ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
@@ -3619,5 +3639,5 @@
 #. *
 #. * the decimal format 999.999
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3626,5 +3646,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3633,5 +3653,5 @@
 #. *
 #. * coordinates East/North
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3683,4 +3703,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}"
@@ -3692,33 +3715,24 @@
 msgstr "Falta de combinación de destino para el objeto con el ID {0}"
 
-#: ../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 "Falta de combinación de destino para el nodo con el ID {0}"
 
-#: ../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 "Falta de combinación de destino para la relación con el ID {0}"
 
-#: ../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 "Blanco de conbinacion perdida del tipo {0} con el ID {1}"
-
-#. 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 ""
-"Objeto con el ID {0} y version {1} es visible atravez de la fuente del "
-"objeto con version anterior {2} no es visible. No podemos manejar esta "
-"inconsistencia. Mantengo el objeto. "
 
 #. translators notes must be in front
@@ -3797,19 +3811,19 @@
 "</p><p>Cierre el diálogo de filtrado para ver todos los objetos.<p></html>"
 
-#: ../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 "una proimitiva con id=0 no puede ser invisible"
 
-#: ../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 "Se esperaba un ID >0. Obtenido {0}"
 
-#: ../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 "Se esperaba una versión > 0. Encontrada {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:795
 #, java-format
 msgid ""
@@ -3820,5 +3834,5 @@
 "changesetId es {0}"
 
-#: ../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 "
@@ -3828,5 +3842,5 @@
 "es nueva y la otra no."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1169
 #, java-format
 msgid ""
@@ -3886,6 +3900,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 ""
 "No se puede comparar la primitiva con ID \"{0}\" con la primitiva con ID "
@@ -3902,5 +3915,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 "seleccionado"
@@ -3966,6 +3979,6 @@
 "NTF<->RGF93 grid"
 msgstr ""
-"Aviso: Error al abrir la secuencia de entrada para el recurso ''/ "
-"data/{0}''. No se puede cargar NTF <-> malla RGF93"
+"Aviso: Error al abrir la secuencia de entrada para el recurso ''/ data/"
+"{0}''. No se puede cargar NTF <-> malla RGF93"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:137
@@ -4066,9 +4079,8 @@
 #: ../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>"
-msgstr ""
-"<html>No se pueden leer los marcadores desde<br>''{0}''<br>El error fue: "
-"{1}</html>"
+msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+"<html>No se pueden leer los marcadores desde<br>''{0}''<br>El error fue: {1}"
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
@@ -4138,5 +4150,5 @@
 #. color tiger_data
 #. </rule>
-#. 
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4146,5 +4158,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4153,5 +4165,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4160,5 +4172,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4167,5 +4179,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4174,5 +4186,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4181,9 +4193,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--annotation tags -->
-#. 
+#.
 #. <!--"work in progress" tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="building"/>
@@ -4192,5 +4204,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 "edificio"
@@ -4277,5 +4289,5 @@
 msgstr "Objeto borrado"
 
-#: ../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
@@ -4501,6 +4513,5 @@
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
-msgstr ""
-"La opción de configuración {0} ha sido eliminada porque ya no se usa."
+msgstr "La opción de configuración {0} ha sido eliminada porque ya no se usa."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
@@ -4510,5 +4521,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
@@ -4517,4 +4528,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
@@ -4625,6 +4637,6 @@
 msgstr ""
 "Clic con el botón central otra vez para desplazarse por las opciones. "
-"<br>Mantenga CTRL para seleccionar directamente d esta lista con el "
-"ratón.<hr>"
+"<br>Mantenga CTRL para seleccionar directamente d esta lista con el ratón."
+"<hr>"
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
@@ -4675,6 +4687,6 @@
 "relation</strong>.</html>"
 msgstr ""
-"<html>Confirme el borrado <strong>1 objeto</strong> de <strong>1 "
-"relación</strong>.</html>"
+"<html>Confirme el borrado <strong>1 objeto</strong> de <strong>1 relación</"
+"strong>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152
@@ -4725,5 +4737,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
@@ -4768,11 +4780,11 @@
 "<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>"
-msgstr ""
-"<html>Alternativamente puede introducir una <strong>dirección de "
-"tesela</strong> para una tesela en el formato <i>nivel_de_zoom/x/y</i>, por "
-"ejemplo <i>15/256/223</i>.Las direcciones de tesela en el formato "
-"<i>zoom,x,y</i> o <i>zoom;x;y</i> también son válidas.</html>"
+"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"html>"
+msgstr ""
+"<html>Alternativamente puede introducir una <strong>dirección de tesela</"
+"strong> para una tesela en el formato <i>nivel_de_zoom/x/y</i>, por ejemplo "
+"<i>15/256/223</i>.Las direcciones de tesela en el formato <i>zoom,x,y</i> o "
+"<i>zoom;x;y</i> también son válidas.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
@@ -4803,5 +4815,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"
@@ -4810,5 +4822,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"
@@ -4817,5 +4829,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"
@@ -5051,6 +5063,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 ""
 "Copiar sus elementos seleccionados al final de la lista de elementos "
@@ -5137,6 +5148,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their "
-"entries.</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 "<html>Pulsar <strong>{0}</strong> para iniciar la fusión de mis entradas y "
@@ -5146,6 +5157,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their "
-"entries.</html>"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
+"html>"
 msgstr ""
 "<html>Pulsar <strong>{0}</strong> para terminar la fusión de mis entradas y "
@@ -5200,6 +5211,6 @@
 #, java-format
 msgid ""
-"<html>An error occurred while communicating with the server<br>Details: "
-"{0}</html>"
+"<html>An error occurred while communicating with the server<br>Details: {0}</"
+"html>"
 msgstr ""
 "<html>Ocurrió un error mientras se comunicaba con el servidor<br>Detalles: "
@@ -5439,10 +5450,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"
@@ -5451,10 +5464,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
@@ -5541,4 +5556,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 "ninguno"
@@ -5695,6 +5711,6 @@
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
 msgstr ""
-"<html>Asigne un valor a la clave, por ejemplo. "
-"<strong><tt>fixme</tt></strong></html>"
+"<html>Asigne un valor a la clave, por ejemplo. <strong><tt>fixme</tt></"
+"strong></html>"
 
 #. Strings in GTK ColorChooser
@@ -5770,11 +5786,11 @@
 #: ../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>"
-msgstr ""
-"<html>Activar para mostrar las Modificaciones de los objetos "
-"seleccionados.<br>Desactivar para mostrar todas las Modificaciones de los "
-"objetos de la capa actual.</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 ""
+"<html>Activar para mostrar las Modificaciones de los objetos seleccionados."
+"<br>Desactivar para mostrar todas las Modificaciones de los objetos de la "
+"capa actual.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
@@ -5799,6 +5815,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 ""
 "Descarga información sobre las modificaciones seleccionadas desde el "
@@ -5826,6 +5841,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:457
 msgid "Opens the Changeset Manager window for the selected changesets"
-msgstr ""
-"Abre el gestor de modificaciones para las modificaciones seleccionadas"
+msgstr "Abre el gestor de modificaciones para las modificaciones seleccionadas"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74
@@ -5847,5 +5861,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
@@ -5923,10 +5937,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 ""
 
@@ -5949,5 +5962,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
@@ -5955,5 +5968,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 "Añadir"
@@ -6002,5 +6015,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 "Historial"
@@ -6152,11 +6165,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373
 msgid "Create a copy of this relation and open it in another editor window"
-msgstr ""
-"Crear una copia de esta relación y abrirla en otra ventana de edición."
+msgstr "Crear una copia de esta relación y abrirla en otra ventana de edición."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:433
 msgid "Set the current selection to the list of selected relations"
-msgstr ""
-"Establecer la selección actual a la lista de relaciones seleccionadas"
+msgstr "Establecer la selección actual a la lista de relaciones seleccionadas"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
@@ -6223,10 +6234,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 "Seleccionar en la lista de relaciones"
 
 #: ../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 "Seleccionar relación en la lista de relaciones."
@@ -6405,6 +6416,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:512
 msgid "Download my changesets from the OSM server (max. 100 changesets)"
-msgstr ""
-"Descarga mis modificaciones del servidor OSM (100 modificaciones máx.)"
+msgstr "Descarga mis modificaciones del servidor OSM (100 modificaciones máx.)"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:518
@@ -6480,6 +6490,5 @@
 #, java-format
 msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-"({0}/{1}) Descargando el contenido para el conjunto de cambios {2}..."
+msgstr "({0}/{1}) Descargando el contenido para el conjunto de cambios {2}..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:176
@@ -6523,6 +6532,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:317
 msgid "Select the corresponding primitives in the current data layer"
-msgstr ""
-"Selecciona las primitivas correspondientes en la capa de datos actual"
+msgstr "Selecciona las primitivas correspondientes en la capa de datos actual"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:324
@@ -6536,6 +6544,6 @@
 "''{0}''.</html>"
 msgstr[0] ""
-"<html>El objeto elegido no está disponible en la <br>capa de "
-"edición''{0}''.</html>"
+"<html>El objeto elegido no está disponible en la <br>capa de edición''{0}''."
+"</html>"
 msgstr[1] ""
 "<html>Ninguno de los objetos seleccionados está disponible en la <br>capa de "
@@ -7735,9 +7743,9 @@
 #, 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>"
-msgstr ""
-"Introduzca la fecha en el formato habitual de su zona.<br>Ejemplo: "
-"{0}<br>Ejemplo: {1}<br>Ejemplo: {2}<br>Ejemplo: {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 ""
+"Introduzca la fecha en el formato habitual de su zona.<br>Ejemplo: {0}"
+"<br>Ejemplo: {1}<br>Ejemplo: {2}<br>Ejemplo: {3}<br>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1127
@@ -7747,6 +7755,6 @@
 "{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
 msgstr ""
-"Introduzca la hora en el formato habitual de su zona.<br>Ejemplo: "
-"{0}<br>Ejemplo: {1}<br>Ejemplo: {2}<br>Ejemplo: {3}<br>"
+"Introduzca la hora en el formato habitual de su zona.<br>Ejemplo: {0}"
+"<br>Ejemplo: {1}<br>Ejemplo: {2}<br>Ejemplo: {3}<br>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:108
@@ -7762,8 +7770,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 ""
 
@@ -7886,9 +7894,9 @@
 msgstr "La URL de consulta de modificaciones no es válida"
 
-#: ../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 "Añadir propiedades"
 
-#: ../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."
@@ -7897,23 +7905,23 @@
 msgstr[1] "Se modificarán {0} objetos."
 
-#: ../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 "Un valor vacío borra el atributo."
 
-#: ../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 "<diferente>"
 
-#: ../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 "¿Modificar valores?"
 
-#: ../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"
@@ -7922,5 +7930,5 @@
 msgstr[1] "Cambiar las propiedades de hasta {0} objetos"
 
-#: ../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."
@@ -7929,78 +7937,78 @@
 msgstr[1] "Esto cambiará {0} objetos."
 
-#: ../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 "Por favor, selecciona una etiqueta"
 
-#: ../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 "Por favor, selecciona un valor"
 
-#: ../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 ""
 "Por favor, seleccione los objetos a los que desea cambiar las propiedades."
 
-#: ../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 "Propiedades/Relaciones"
 
-#: ../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 "Propiedades de los objetos seleccionados."
 
 #. 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 "Miembro de"
 
-#: ../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 "Posición"
 
-#: ../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 "Propiedades: {0} / Miembros: {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 "Propiedades / Miembros"
 
-#: ../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 "Cambiar relación"
 
-#: ../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 "Borrar de la relación"
 
-#: ../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 "¿Seguro de eliminar la selección de la relación {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 "Borrar la clave seleccionada en todos los objetos"
 
-#: ../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 "Eliminar propiedades"
 
-#: ../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 "Añadir una nueva pareja clave/valor para todos los objetos"
 
-#: ../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 "Editar el valor de la clave seleccionada para todos los objetos"
 
-#: ../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 "Seleccionar relación"
 
-#: ../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 "Seleccionar la relación en la selección principal."
@@ -8115,12 +8123,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294
 msgid "Enter a role and apply it to the selected relation members"
-msgstr ""
-"Inserte un papel y aplicalo a las relaciones de miembros seleccionadas"
+msgstr "Inserte un papel y aplicalo a las relaciones de miembros seleccionadas"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572
 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 ""
 
@@ -8138,6 +8145,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 ""
 
@@ -8292,6 +8299,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
 msgid "Click to create a conflict and close this relation editor"
-msgstr ""
-"Haga click para crear un conflicto y cerrar este editor de relaciones"
+msgstr "Haga click para crear un conflicto y cerrar este editor de relaciones"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
@@ -8314,7 +8320,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 ""
 "<html>La capa ''{0}'' tiene un conflicto con la primitiva <br>''{1}''.<br>Es "
@@ -8531,6 +8536,5 @@
 msgid ""
 "Currently, there is no download area selected. Please select an area first."
-msgstr ""
-"No hay actualmente ningún área para descargar. Elija primero un área."
+msgstr "No hay actualmente ningún área para descargar. Elija primero un área."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:201
@@ -8664,7 +8668,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 ""
 
@@ -8805,6 +8808,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 ""
 
@@ -8814,6 +8817,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 ""
 
@@ -9087,18 +9090,17 @@
 "version of one<br>of your nodes, ways, or relations.<br>The conflict is "
 "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click "
-"<strong>{4}</strong> to synchronize the conflicting primitive only.<br>Click "
-"<strong>{5}</strong> to synchronize the entire local dataset with the "
-"server.<br>Click <strong>{6}</strong> to abort and continue "
-"editing.<br></html>"
+"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
+"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
+"strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{6}</strong> to abort and continue editing.<br></html>"
 msgstr ""
 "<html>La subida <strong>falló</strong> debido a que el servidor tiene una "
 "versión más reciente de uno<br>de sus nodos, vías o relaciones.<br>El "
-"conflicto es causado por el <strong>{0}</strong> con ID "
-"<strong>{1}</strong>,<br>el servidor tiene la versión {2}, su versión es "
-"{3}.<br><br>Pulse <strong>{4}</strong> para sincronizar los primitivos en "
-"conflicto únicamente.<br>Pulse <strong>{5}</strong> para sincronizar el "
-"conjunto de datos local completo con el servidor.<br>Pulse "
-"<strong>{6}</strong> para abortar y continuar editando.<br></html>"
+"conflicto es causado por el <strong>{0}</strong> con ID <strong>{1}</strong>,"
+"<br>el servidor tiene la versión {2}, su versión es {3}.<br><br>Pulse "
+"<strong>{4}</strong> para sincronizar los primitivos en conflicto únicamente."
+"<br>Pulse <strong>{5}</strong> para sincronizar el conjunto de datos local "
+"completo con el servidor.<br>Pulse <strong>{6}</strong> para abortar y "
+"continuar editando.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
@@ -9112,14 +9114,13 @@
 msgid ""
 "<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click "
-"<strong>{0}</strong> to synchronize the entire local dataset with the "
-"server.<br>Click <strong>{1}</strong> to abort and continue "
-"editing.<br></html>"
+"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
+"</strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{1}</strong> to abort and continue editing.<br></html>"
 msgstr ""
 "<html>La subida <strong>falló</strong> porque el servidor tiene una versión "
-"más reciente de uno<br>de sus nodos, vías o relaciones.<br><br>Pulse "
-"<strong>{0}</strong> para sincronizar el conjunto de datos local completo "
-"con el servidor.<br>Pulse <strong>{1}</strong>  para abortar y continuar "
-"editando.<br></html>"
+"más reciente de uno<br>de sus nodos, vías o relaciones.<br><br>Pulse <strong>"
+"{0}</strong> para sincronizar el conjunto de datos local completo con el "
+"servidor.<br>Pulse <strong>{1}</strong>  para abortar y continuar editando."
+"<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194
@@ -9131,7 +9132,7 @@
 msgstr ""
 "<html>El envío de datos <strong>falló</strong> debido a que se ha "
-"empleado<br>un conjunto de cambios {0} que se cerró previamente "
-"({1}).<br>Vuelva a enviar los datos de nuevo con un conjunto de cambios "
-"nuevo o uno existente y abierto.</html>"
+"empleado<br>un conjunto de cambios {0} que se cerró previamente ({1})."
+"<br>Vuelva a enviar los datos de nuevo con un conjunto de cambios nuevo o "
+"uno existente y abierto.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202
@@ -9380,5 +9381,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 "No"
@@ -9386,6 +9387,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 ""
 
@@ -9470,6 +9470,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] ""
@@ -9483,6 +9483,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 "
@@ -9714,5 +9714,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9730,6 +9730,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44
 msgid "Objects are uploaded to a <strong>new changeset</strong>."
-msgstr ""
-"Los objetos son subidos a <strong>nuevo conjunto de cambios</strong>."
+msgstr "Los objetos son subidos a <strong>nuevo conjunto de cambios</strong>."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48
@@ -9743,6 +9742,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 ""
 "El conjunto de cambios va a <strong>cerrarse</strong> después de esta subida"
@@ -9764,6 +9762,6 @@
 "Subiendo <strong>{0} objeto</strong> a <strong>1 conjunto de cambios</strong>"
 msgstr[1] ""
-"Subiendo <strong>{0} objetos</strong> a <strong>1 conjunto de "
-"cambios</strong>"
+"Subiendo <strong>{0} objetos</strong> a <strong>1 conjunto de cambios</"
+"strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:87
@@ -9776,9 +9774,9 @@
 "<strong>1 request</strong>"
 msgstr[0] ""
-"Subiendo <strong>{0} objeto</strong> a <strong>1 conjunto de "
-"cambios</strong> usando <strong>1 petición</strong>"
+"Subiendo <strong>{0} objeto</strong> a <strong>1 conjunto de cambios</"
+"strong> usando <strong>1 petición</strong>"
 msgstr[1] ""
-"Subiendo <strong>{0} objetos</strong> a <strong>1 conjunto de "
-"cambios</strong> usando <strong>1 petición</strong>"
+"Subiendo <strong>{0} objetos</strong> a <strong>1 conjunto de cambios</"
+"strong> usando <strong>1 petición</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:92
@@ -9788,6 +9786,6 @@
 "<strong>{1} requests</strong>"
 msgstr ""
-"Subiendo <strong>{0} objetos</strong> a <strong>1 conjunto de "
-"cambios</strong> usando <strong>{1} peticiones</strong>"
+"Subiendo <strong>{0} objetos</strong> a <strong>1 conjunto de cambios</"
+"strong> usando <strong>{1} peticiones</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:94
@@ -9807,6 +9805,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 ""
 "Subiendo <strong>{0} objetos</strong> a <strong>múltiples conjuntos de "
@@ -9863,7 +9861,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 ""
 
@@ -9873,5 +9871,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9887,5 +9885,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..."
@@ -9896,6 +9894,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 ""
 "Se ignora la excepción capturada debido a que se ha cancelado la subida. La "
@@ -10116,7 +10113,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 ""
 
@@ -10142,7 +10139,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 ""
 
@@ -10206,6 +10203,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 ""
 "<html>La subida de datos gps sin procesar como datos de mapa se considera "
@@ -10272,6 +10269,6 @@
 "wish<br>to continue?</html>"
 msgstr ""
-"<html>Esta acción requiere {0} peticiones<br>individuales de "
-"descarga.<br¿Desea continuar?</html>"
+"<html>Esta acción requiere {0} peticiones<br>individuales de descarga."
+"<br¿Desea continuar?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
@@ -10394,6 +10391,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 ""
 
@@ -10453,11 +10450,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
 msgid ""
-"<html>Take a photo of your GPS receiver while it displays the "
-"time.<br>Display that photo here.<br>And then, simply capture the time you "
-"read on the photo and select a timezone<hr></html>"
-msgstr ""
-"<html>Tome una foto de su receptor GPS mientras muestra la hora "
-"exacta.<br>Exponga esa foto aquí.<br>Y luego, simplemente tome la hora que "
-"usted lee en la foto y seleccione una zona horaria<hr></html>"
+"<html>Take a photo of your GPS receiver while it displays the time."
+"<br>Display that photo here.<br>And then, simply capture the time you read "
+"on the photo and select a timezone<hr></html>"
+msgstr ""
+"<html>Tome una foto de su receptor GPS mientras muestra la hora exacta."
+"<br>Exponga esa foto aquí.<br>Y luego, simplemente tome la hora que usted "
+"lee en la foto y seleccione una zona horaria<hr></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
@@ -10941,6 +10938,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
 msgid "There was an error while trying to display the URL for this marker"
-msgstr ""
-"Ha habido un error cuando se intentaba mostrar la URL de este marcador"
+msgstr "Ha habido un error cuando se intentaba mostrar la URL de este marcador"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
@@ -11053,6 +11049,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 ""
 
@@ -11074,8 +11070,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 ""
 "Introduzca su usuario y contraseña de OSM. La contraseña <strong>no</strong> "
@@ -11201,6 +11197,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 ""
 
@@ -11311,6 +11307,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 ""
 
@@ -11444,8 +11439,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 ""
 
@@ -11528,8 +11523,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 ""
 
@@ -11556,7 +11551,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 ""
 
@@ -11610,5 +11605,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 "Por favor, seleccione la fila a borrar"
@@ -11989,6 +11984,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 ""
 "Dibujar flechas de dirección usando visualizaciones de tablas en vez de "
@@ -12054,6 +12048,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 ""
 "Aplicar antialias a la vista del mapa da como resultado una apariencia más "
@@ -12129,5 +12122,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 "Activar los valores predefinidos por defecto"
@@ -12147,6 +12140,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>:"
@@ -12224,6 +12216,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:401
 msgid "Configure the list of sites where plugins are downloaded from"
-msgstr ""
-"Configurar la lista de sitios desde donde se descargar los componentes"
+msgstr "Configurar la lista de sitios desde donde se descargar los componentes"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:463
@@ -12272,6 +12263,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 ""
 
@@ -12284,9 +12275,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 ""
 
@@ -12586,6 +12577,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 ""
 
@@ -12596,5 +12587,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 ""
@@ -12604,18 +12595,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 ""
@@ -12624,5 +12615,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 ""
@@ -12631,5 +12622,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 ""
@@ -12638,9 +12629,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 "Ordenar menú de preajustes"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
 msgid "Tagging Presets"
 msgstr "Etiquetas preestablecidas"
@@ -12753,6 +12744,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 ""
 
@@ -12774,6 +12765,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 ""
 
@@ -12855,6 +12846,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 ""
 
@@ -12870,6 +12860,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 ""
 
@@ -12966,6 +12955,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 ""
 
@@ -13101,4 +13090,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 "Cambiar propiedades"
@@ -13264,5 +13254,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
@@ -13282,5 +13272,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}''"
@@ -13449,6 +13439,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 ""
 
@@ -13564,14 +13553,13 @@
 #, java-format
 msgid "Communications with {0} established using protocol version {1}."
-msgstr ""
-"Establecidas comunicaciones con {0} usando la versión de protocolo {1}"
+msgstr "Establecidas comunicaciones con {0} usando la versión de protocolo {1}"
 
 #: ../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 ""
@@ -13579,69 +13567,69 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
 msgid "Creating changeset..."
 msgstr "Creando conjunto de cambios..."
 
-#: ../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 "Conjunto de cambios {0} abierto con éxito"
 
-#: ../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 "Actualizando conjunto de cambios..."
 
-#: ../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 "Actualizando conjunto de cambios {0}..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:388
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389
 msgid "Closing changeset..."
 msgstr "Cerrando conjunto de cambios..."
 
-#: ../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 "Sin nuevos cambios que enviar"
 
-#: ../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 "Esperando 10 segundos... "
 
-#: ../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 "Reintentando {0} de {1} en {2} segundos..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:458
 msgid "OK - trying again."
 msgstr "OK - intentando de nuevo."
 
-#: ../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 "Reintentando {0} de {1}."
 
-#: ../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}."
@@ -13827,4 +13815,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})"
@@ -13844,6 +13833,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 ""
 
@@ -13871,6 +13860,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 ""
 
@@ -13912,6 +13901,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 ""
 
@@ -14351,6 +14339,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 ""
 
@@ -14489,6 +14477,6 @@
 "An unexpected exception occurred that may have come from the ''{0}'' plugin."
 msgstr ""
-"Sucedió una excepción imprevista. Pudo ser originada por el componente "
-"\"{0}\"."
+"Sucedió una excepción imprevista. Pudo ser originada por el componente \"{0}"
+"\"."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
@@ -14567,6 +14555,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 ""
 
@@ -14634,5 +14621,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"
@@ -14693,6 +14680,6 @@
 "the server URL in your preferences and your internet connection.</html>"
 msgstr ""
-"<html>Fallo al iniciar la conmunicación con el servidor OSM "
-"{0}.<br>Verifique la URL del servidor en sus preferencias y su conexión de "
+"<html>Fallo al iniciar la conmunicación con el servidor OSM {0}."
+"<br>Verifique la URL del servidor en sus preferencias y su conexión de "
 "Internet.</html>"
 
@@ -14713,8 +14700,8 @@
 "reference to relation {0}, and upload again.</html>"
 msgstr ""
-"<html><strong>Fallo</strong> al borrar la<strong>relación "
-"{0}</strong>.Todavía se hace referencia a la relación {1}.<br>Por favor, "
-"cargue la relación{1}, elimine las referencias a la relación {0}, y súbalo "
-"de nuevo.</html>"
+"<html><strong>Fallo</strong> al borrar la<strong>relación {0}</strong>."
+"Todavía se hace referencia a la relación {1}.<br>Por favor, cargue la "
+"relación{1}, elimine las referencias a la relación {0}, y súbalo de nuevo.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:105
@@ -14722,17 +14709,17 @@
 msgid ""
 "<html>Uploading to the server <strong>failed</strong> because your "
-"current<br>dataset violates a precondition.<br>The error message "
-"is:<br>{0}</html>"
+"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
+"html>"
 msgstr ""
 "<html> Subida al servidor <strong>fallida</strong> debido a que su actual "
-"conjunto de datos<br> viola una condición previa.<br> El mensaje de error "
-"es:<br>{0}</html>"
+"conjunto de datos<br> viola una condición previa.<br> El mensaje de error es:"
+"<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:113
 #, 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 ""
 
@@ -14740,7 +14727,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 ""
 
@@ -14748,8 +14735,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 ""
 
@@ -14769,7 +14756,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 ""
 
@@ -14851,11 +14838,10 @@
 #, 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>"
-msgstr ""
-"<html>El servidor OSM <br>''{0}''<br>informa de un error de servidor "
-"interno.<br>Esto suele ser un problema temporal. Inténtelo de nuevo más "
-"tarde, por favor.</html>"
+"<html>The OSM server<br>''{0}''<br>reported an internal server error."
+"<br>This is most likely a temporary problem. Please try again later.</html>"
+msgstr ""
+"<html>El servidor OSM <br>''{0}''<br>informa de un error de servidor interno."
+"<br>Esto suele ser un problema temporal. Inténtelo de nuevo más tarde, por "
+"favor.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
@@ -14866,7 +14852,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 ""
 "El área que intentó descargar es demasiado grande o su solicitud era "
@@ -14901,6 +14887,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 ""
 
@@ -14964,6 +14950,6 @@
 "\n"
 msgstr ""
-"No se pudo establecer el atajo de teclado \"{0}\" para la acción \"{1}\" "
-"({2})\n"
+"No se pudo establecer el atajo de teclado \"{0}\" para la acción \"{1}"
+"\" ({2})\n"
 "porque ese atajo está actualmente establecido para \"{3}\" ({4}).\n"
 "\n"
@@ -15428,6 +15414,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>"
@@ -15454,6 +15440,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"
@@ -15491,6 +15477,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"
@@ -15506,7 +15492,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"
@@ -15557,9 +15543,29 @@
 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 "Edificios"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#, fuzzy
+msgid "Rotate crosshair"
+msgstr "Rotar hacia la derecha"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#, fuzzy
+msgid "Advanced settings"
+msgstr "Configurar ajustes avanzados"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#, fuzzy
+msgid "Building tag:"
+msgstr "Edificio"
+
+#: ../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"
@@ -15568,35 +15574,45 @@
 #: ../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 "Edificio público"
+
+#: ../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
+#, fuzzy
+msgid "Advanced..."
+msgstr "Avanzado"
+
+#: ../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 ""
 
@@ -15773,7 +15789,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--waterway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15783,5 +15799,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15791,5 +15807,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15805,5 +15821,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15813,5 +15829,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15819,8 +15835,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 "lámina de agua"
@@ -15842,5 +15858,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15849,5 +15865,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15856,5 +15872,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15863,5 +15879,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15870,5 +15886,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15877,10 +15893,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 "dirección"
@@ -15909,19 +15925,17 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.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 ""
 "Un componente especial para el manejo del servidor WMS del catastro francés "
 "en www.cadastre.gouv.fr<BR><BR>Por favor, lea los Términos y Condiciones de "
-"Uso aquí (en francés):<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>antes de subir cualquier dato creado mediante este componente."
+"Uso aquí (en francés):<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>antes de subir cualquier dato "
+"creado mediante este componente."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98
@@ -16365,6 +16379,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 "Capa vacía"
@@ -16552,4 +16566,52 @@
 msgstr "No se encontró la capa de datos GPX"
 
+#: ../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 "Editar zoo"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#, fuzzy
+msgid "Name:"
+msgstr "Nombre"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#, fuzzy
+msgid "CmdLine:"
+msgstr "Coordenadas:"
+
+#: ../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
+#, fuzzy, java-format
+msgid "Delete tool \"{0}\"?"
+msgstr "Eliminar nodo {0}"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:74
+msgid "Are you sure?"
+msgstr "¿Está seguro?"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
+#, fuzzy
+msgid "New tool..."
+msgstr "Función nueva"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
+#, fuzzy
+msgid "Install"
+msgstr "Industrial"
+
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
 msgid "Position only"
@@ -16672,6 +16734,6 @@
 msgstr ""
 "No se puede cargar la biblioteca rxtxSerial. Si usted necesita ayuda para "
-"instalarla inténtelo en la página web GlobalSat : http://www.raphael-"
-"mack.de/josm-globalsat-gpx-import-plugin/"
+"instalarla inténtelo en la página web GlobalSat : http://www.raphael-mack.de/"
+"josm-globalsat-gpx-import-plugin/"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
@@ -16819,5 +16881,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#. 
+#.
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16938,6 +17000,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 ""
 "Máximo numero de segmentos permitidos en cada vía generada. Por Defecto 250."
@@ -16961,7 +17022,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 ""
 "Precisión en la simplificación de línea Douglas-Peucker, medido en grados. "
@@ -16986,6 +17046,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Offset all points in North direction (degrees). Default 0."
-msgstr ""
-"Trasladar todos los puntos en dirección Norte (por defecto 0 grados)."
+msgstr "Trasladar todos los puntos en dirección Norte (por defecto 0 grados)."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
@@ -17179,6 +17238,5 @@
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46
 msgid "Adds no left turn for sets of 4 or 5 ways."
-msgstr ""
-"Añadir giros prohibidos a la izquierda para el conjunto de 4 o 5 vías."
+msgstr "Añadir giros prohibidos a la izquierda para el conjunto de 4 o 5 vías."
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:59
@@ -17260,7 +17318,7 @@
 "new server? (Strongly recommended)</html>"
 msgstr ""
-"<html>El componente OpenStreetBugs usa el antiguo servidor de "
-"appspot.com.<br>Un nuevo servidor está disponible en schokokeks.org. <br> "
-"¿Quiere cambiar al nuevo servidor? (Recomendado)</html>"
+"<html>El componente OpenStreetBugs usa el antiguo servidor de appspot.com."
+"<br>Un nuevo servidor está disponible en schokokeks.org. <br> ¿Quiere "
+"cambiar al nuevo servidor? (Recomendado)</html>"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:109
@@ -17287,6 +17345,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 ""
 "La cabecera contiene varios valores y no puede ser transferida a una sola "
@@ -17361,6 +17418,6 @@
 "comment:</html>"
 msgstr ""
-"<html>¿Desea realmente marcar marcar está cuestión como "
-"\"hecha\"?<br><br>Puedes añadir una comentario opcional:</html>"
+"<html>¿Desea realmente marcar marcar está cuestión como \"hecha\"?"
+"<br><br>Puedes añadir una comentario opcional:</html>"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
@@ -17402,6 +17459,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 ""
 
@@ -17454,6 +17510,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 ""
 
@@ -17821,5 +17876,5 @@
 msgstr "Revertir"
 
-#: ../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}"
@@ -17870,4 +17925,42 @@
 msgid "Revert changeset #{0}"
 msgstr ""
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:78
+#, fuzzy
+msgid "Road Sign Plugin"
+msgstr "Cargando los complementos"
+
+#: ../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 "No se pudo leer la fuente de las preferencias de etiquetas: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
+#, fuzzy, java-format
+msgid "Error parsing tagging preset from ''{0}'':\n"
+msgstr ""
+"Analizando sintáctivamente la lista de componentes desde el sitio ''{0}''"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:104
+#, fuzzy, java-format
+msgid "Sign {0}"
+msgstr "Selección: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:111
+#, fuzzy, java-format
+msgid "Additional sign {0}"
+msgstr "Añadir relación {0}"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -17973,4 +18066,15 @@
 msgid "Enter weight values"
 msgstr "Introduzca el peso de los valores"
+
+#: ../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 "Simplificar vía"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
+#, fuzzy
+msgid "Delete unnecessary nodes from an area."
+msgstr "Eliminar nodos innecesarios de una vía."
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
@@ -18487,6 +18591,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:411
 msgid "Save the turn restriction despite of errors and/or warnings"
-msgstr ""
-"Salvar la restricción de giro a pesar de los errores y/o advertencias"
+msgstr "Salvar la restricción de giro a pesar de los errores y/o advertencias"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:415
@@ -18787,6 +18890,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 ""
 "El desarrollo del complemento para restricciones de giro fue patrocinado por "
@@ -18883,8 +18986,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 ""
 
@@ -18938,8 +19041,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 ""
 
@@ -19055,6 +19158,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 ""
 
@@ -19062,6 +19165,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 ""
 
@@ -19735,7 +19838,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 ""
 "Los archivos de datos de las fuentes (URL o nombre de archivo) del corrector "
@@ -19936,9 +20038,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 "área"
@@ -20041,11 +20143,147 @@
 msgstr "{0}, ..."
 
-#: ../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
+#, fuzzy, java-format
+msgid "{0} {1}% of GPS track"
+msgstr "{0} formado por la traza {1}"
+
+#: ../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 "Importar audio"
+
+#: ../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 "Eliminar"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
+#, fuzzy
+msgid "removes current video from layer"
+msgstr "Eliminar foto de la capa"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
+#, fuzzy
+msgid "play/pause"
+msgstr "Reproducción/Pausa"
+
+#: ../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 "fondo"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
+#, fuzzy
+msgid "jumps n sec back"
+msgstr "Atrás."
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "forward"
+msgstr "Avanzar"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "jumps n sec forward"
+msgstr "Salta hacia delante"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
+#, fuzzy
+msgid "faster"
+msgstr "Más rápido"
+
+#: ../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 "Más lento"
+
+#: ../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 "Permite añadir marcadores/nodos a las posiciones GPS actual."
+
+#. 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
+#, fuzzy
+msgid "Jump length"
+msgstr "Ir allí"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#, fuzzy
+msgid "Set the length of a jump"
+msgstr "Definir idioma"
+
+#: ../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
+#, fuzzy
+msgid "Loop length"
+msgstr "Longitud"
+
+#: ../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 "capa"
+
+#: ../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 ""
 
@@ -20058,6 +20296,6 @@
 "Display a map that was previously scanned and uploaded to walking-papers.org"
 msgstr ""
-"Mostrar un mapa que estaba anteriormente escaneado y subido a walking-"
-"papers.org"
+"Mostrar un mapa que estaba anteriormente escaneado y subido a walking-papers."
+"org"
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29
@@ -20277,9 +20515,9 @@
 "Esto puede dar lugar a unas coordenadas erróneas."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
 msgid "Automatic downloading"
 msgstr "Descarga automática"
 
-#: ../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}''"
@@ -20288,19 +20526,19 @@
 "''{0}''"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:105
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
 msgid "(deactivated)"
 msgstr "(desactivado)"
 
-#: ../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 "Capa WMS ({0}) descargándose automáticamente en el zoom {1}"
 
-#: ../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 "Capa WMS ({0}), descargando en zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
 #, java-format
 msgid ""
@@ -20315,17 +20553,17 @@
 "teselas WMS de todos modos?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Yes, fetch images"
 msgstr "Sí, descargar las imágenes"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Invalid URL?"
 msgstr "¿URL no válida?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311
 msgid "Download visible tiles"
 msgstr "Descargar las teselas visibles"
 
-#: ../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"
@@ -20334,101 +20572,101 @@
 "más, o cambie la resolución"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329
 msgid "Change resolution"
 msgstr "Cambiar resolución"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341
 msgid "Reload erroneous tiles"
 msgstr "Recargar teselas erróneas"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365
 msgid "Alpha channel"
 msgstr "Canal alfa"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385
 msgid "Save WMS layer to file"
 msgstr "Guardar capa WMS como archivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
 msgid "Save WMS layer"
 msgstr "Salvar capa WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413
 msgid "Load WMS layer from file"
 msgstr "Cargar capa WMS desde archivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
 msgid "Load WMS layer"
 msgstr "Cargar capa WMS"
 
-#: ../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 "Versión de archivo WMS no soportada; encontrada {0}, esperada {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
 msgid "File Format Error"
 msgstr "Error en el formato del archivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449
 msgid "Error loading file"
 msgstr "Error al leer el archivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463
 msgid "Set WMS Bookmark"
 msgstr "Fijar marcador WMS"
 
-#: ../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 "Abrir una capa WMS en blanco para cargar datos desde un archivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
 msgid "WMS Plugin Preferences"
 msgstr "Preferencias del componente WMS"
 
-#: ../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 ""
-"Modificar la lista de servidores WMS mostrados en el menú del componente WMS "
-"\n"
+"Modificar la lista de servidores WMS mostrados en el menú del componente "
+"WMS \n"
 "(seleccionar de la lista inferior de servidores posibles y pulsar botón "
 "\"añadir\" \n"
 "para añadirlo a la lista superior de servidores mostrados)"
 
-#: ../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 "Nombre del menú"
 
-#: ../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 "Dirección URL del servicio WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "Menu Name (Default)"
 msgstr "Nombre del menú (por defecto)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "WMS URL (Default)"
 msgstr "Dirección URL del servicio WMS (Por defecto)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:86
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
 msgid "Enter a menu name and WMS URL"
 msgstr "Introduce un nombre y una dirección para el servicio WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:111
 msgid "Copy Selected Default(s)"
 msgstr "Copiar la/s seleccionada/s por defecto"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
 msgid "Please select at least one row to copy."
 msgstr "Por favor, seleccione al menos una fila para copiar"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
 msgid "Downloader:"
 msgstr "Gestor de descarga:"
@@ -20445,4 +20683,9 @@
 msgid "% of north:"
 msgstr "% hacia el Norte"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186
+#, fuzzy
+msgid "Simultaneous connections"
+msgstr "Nodo: conexión"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -20454,7 +20697,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
@@ -20506,8 +20749,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 "plantación forestal"
@@ -20524,7 +20767,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--boundary tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -20534,5 +20777,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -20575,5 +20818,5 @@
 #. color boundary
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -20583,5 +20826,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -20591,5 +20834,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -20599,15 +20842,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 "frontera"
@@ -20623,5 +20866,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -20630,7 +20873,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--route tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -20640,5 +20883,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -20648,5 +20891,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -20656,5 +20899,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -20664,5 +20907,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -20672,5 +20915,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -20680,5 +20923,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -20688,12 +20931,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 "ruta"
@@ -20984,7 +21227,6 @@
 
 #. 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 ""
 "Descargar puntos GPS desde el registrador de datos GlobalSat DG100 "
@@ -20992,16 +21234,15 @@
 
 #. Plugin graphview
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:28
 msgid "Visualizes routing information as a routing graph."
-msgstr ""
-"Visualiza la información de enrutamiento como un gráfico de enrutado."
+msgstr "Visualiza la información de enrutamiento como un gráfico de enrutado."
 
 #. Plugin grid
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:30
 msgid "Provide a background layer that displays a map grid"
 msgstr "Proporciona una capa de fondo que muestra una rejilla en el mapa"
 
 #. 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 "
@@ -21015,10 +21256,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:34
 msgid "Helps vectorizing WMS images."
 msgstr "Ayuda a vectorizar imágenes WMS"
 
 #. 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."
@@ -21028,5 +21269,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 "
@@ -21039,15 +21280,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 "No añadir ningún giro a la izquierda para conjuntos de 4 o 5 vías"
 
 #. 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 "
@@ -21058,5 +21299,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 "
@@ -21070,10 +21311,10 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:48
 msgid "Displays an OpenLayers background image"
 msgstr "Muestra una imágen OpenLayers de fondo"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:50
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
@@ -21082,5 +21323,5 @@
 
 #. 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"
@@ -21090,5 +21331,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."
@@ -21098,5 +21339,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 "
@@ -21105,5 +21346,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 "
@@ -21114,10 +21355,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "El gran JGoodies Plastic Look and Feel."
 
 #. 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."
@@ -21126,15 +21367,16 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "Let other applications send commands to JOSM."
 msgstr "Dejar que otras aplicaciones envíen comandos a JOSM."
 
 #. 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 "
@@ -21146,10 +21388,17 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:71
 msgid "Provides routing capabilities."
 msgstr "Proporciona capacidades de enrutamiento."
 
+#. 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 "
@@ -21160,10 +21409,10 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:77
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Permite añadir marcadores/nodos a las posiciones GPS actual."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:79
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
@@ -21172,5 +21421,5 @@
 
 #. 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 "
@@ -21184,10 +21433,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:83
 msgid "Make terraced houses out of single blocks."
 msgstr "Crea edificios entremedianeras a partir de bloques únicos"
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:85
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21196,5 +21445,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) "
@@ -21203,5 +21452,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:89
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21210,10 +21459,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 "
@@ -21225,5 +21474,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 "
@@ -21233,5 +21482,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:97
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21242,5 +21491,5 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:99
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
@@ -21248,10 +21497,10 @@
 
 #. 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 "
@@ -21260,5 +21509,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:105
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22150,10 +22399,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 "rotonda"
@@ -22290,8 +22539,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"/>
@@ -22501,5 +22750,5 @@
 #. color motorroad
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -22509,5 +22758,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -22526,5 +22775,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -22534,5 +22783,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -22551,5 +22800,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -22559,5 +22808,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -22576,5 +22825,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -22584,5 +22833,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -22597,5 +22846,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -22613,8 +22862,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 "calle urbana"
@@ -22629,5 +22878,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -22636,5 +22885,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--public_transport tags -->
 #. <rule>
@@ -22644,10 +22893,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 "vía de servicio"
@@ -22662,5 +22911,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -22669,5 +22918,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -22677,10 +22926,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 "en construcción"
@@ -23687,9 +23936,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 "marísma"
@@ -24019,5 +24268,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -24027,5 +24276,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -24035,5 +24284,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -24043,5 +24292,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -24051,5 +24300,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -24059,5 +24308,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -24067,5 +24316,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -24076,5 +24325,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -24082,9 +24331,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 "ferrocarril"
@@ -25494,5 +25743,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -25502,5 +25751,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -25510,5 +25759,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -25518,5 +25767,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -25880,7 +26129,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--sport tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -25890,5 +26139,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -25898,5 +26147,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -25906,5 +26155,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -25914,5 +26163,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -25922,5 +26171,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -25930,5 +26179,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -25938,5 +26187,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -25946,5 +26195,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -25954,5 +26203,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -25962,5 +26211,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -25970,5 +26219,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -25978,5 +26227,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -25986,5 +26235,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -25994,5 +26243,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -26002,5 +26251,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -26010,5 +26259,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -26018,5 +26267,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -26026,5 +26275,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -26034,5 +26283,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -26042,5 +26291,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -26050,5 +26299,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -26058,5 +26307,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -26066,5 +26315,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -26074,5 +26323,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -26082,5 +26331,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -26090,5 +26339,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -26098,5 +26347,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -26106,5 +26355,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -26114,5 +26363,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -26122,5 +26371,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -26130,5 +26379,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -26138,5 +26387,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -26146,5 +26395,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -26154,5 +26403,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -26162,5 +26411,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -26170,5 +26419,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -26178,5 +26427,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -26186,5 +26435,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -26194,5 +26443,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -26202,5 +26451,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -26210,5 +26459,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -26218,5 +26467,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -26226,5 +26475,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -26234,5 +26483,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -26242,5 +26491,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -26250,33 +26499,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 "deporte"
@@ -27954,7 +28203,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--landuse tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -27964,5 +28213,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -27972,5 +28221,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -27980,5 +28229,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -27988,5 +28237,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -27996,5 +28245,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -28004,5 +28253,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -28012,5 +28261,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -28020,12 +28269,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 "zona verde"
@@ -29453,5 +29702,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -29467,5 +29716,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -29475,18 +29724,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 -->
@@ -29495,7 +29761,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- cycleway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -29505,5 +29771,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -29513,5 +29779,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -29521,5 +29787,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -29529,12 +29795,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 "bicicleta"
@@ -29561,5 +29828,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -29575,5 +29842,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -29583,5 +29850,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -29590,13 +29857,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"/>
@@ -29607,11 +29882,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 "pie"
@@ -29630,8 +29906,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 "metro"
@@ -29743,9 +30019,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
@@ -29753,5 +30029,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,
@@ -29761,8 +30037,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
@@ -29776,5 +30052,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#. 
+#.
 #: build/trans_style.java:72
 msgid "standard"
@@ -29782,5 +30058,5 @@
 
 #. mappaint style named "standard"
-#. 
+#.
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -29829,6 +30105,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>
@@ -29908,5 +30184,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -29916,16 +30192,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 "obsoleto"
@@ -29936,5 +30212,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -29943,5 +30219,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -29950,5 +30226,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -29964,5 +30240,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -29976,5 +30252,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -29983,5 +30259,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -29990,5 +30266,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -29997,5 +30273,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -30004,5 +30280,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -30011,5 +30287,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -30018,5 +30294,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxweight"/>
@@ -30025,5 +30301,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxheight"/>
@@ -30032,5 +30308,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -30039,5 +30315,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxlength"/>
@@ -30046,5 +30322,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -30053,5 +30329,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="minspeed"/>
@@ -30060,5 +30336,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxstay"/>
@@ -30067,5 +30343,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="toll"/>
@@ -30074,5 +30350,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="barrier"/>
@@ -30249,7 +30525,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- highway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -30263,5 +30539,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -30271,7 +30547,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- tracktype tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -30281,5 +30557,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -30289,5 +30565,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -30297,5 +30573,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -30305,10 +30581,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 "pista"
@@ -30319,5 +30595,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -30326,5 +30602,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -30334,5 +30610,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -30341,5 +30617,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -30348,5 +30624,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -30355,5 +30631,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -30362,5 +30638,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -30369,5 +30645,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -30376,5 +30652,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -30383,5 +30659,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -30390,5 +30666,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -30397,8 +30673,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 "servicios"
@@ -30409,8 +30685,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 "vado"
@@ -30421,5 +30697,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -30428,8 +30704,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 "círculo de giro"
@@ -30440,9 +30716,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 "Punto de acceso de emergencias"
@@ -30453,9 +30729,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 "ribera"
@@ -30466,8 +30742,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 "arroyo"
@@ -30478,8 +30754,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 "muelle"
@@ -30490,5 +30766,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -30497,5 +30773,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -30504,5 +30780,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -30512,5 +30788,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -30519,5 +30795,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -30526,5 +30802,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -30533,5 +30809,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -30541,5 +30817,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -30550,5 +30826,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -30558,7 +30834,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--man_made tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -30568,5 +30844,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -30576,5 +30852,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -30584,5 +30860,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -30593,5 +30869,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -30600,5 +30876,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -30608,5 +30884,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -30616,5 +30892,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -30624,5 +30900,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -30632,5 +30908,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -30640,5 +30916,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -30648,5 +30924,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -30656,5 +30932,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -30664,5 +30940,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -30672,18 +30948,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 "hecho por el hombre"
@@ -30693,9 +30969,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 "rápidos"
@@ -30706,7 +30982,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- railway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -30716,5 +30992,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -30723,5 +30999,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -30731,5 +31007,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -30738,5 +31014,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -30746,5 +31022,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -30754,10 +31030,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 "punto ferroviario"
@@ -30768,5 +31044,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -30777,13 +31053,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 "otros ferrocarriles"
 
 #. color otherrail
-#: build/trans_style.java:1192
+#: build/trans_style.java:1217
 msgid "railover"
 msgstr "paso con más de un cruce ferroviario"
@@ -30794,5 +31070,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -30802,5 +31078,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30813,5 +31089,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30819,7 +31095,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 "vía muerta"
@@ -30830,5 +31106,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -30837,5 +31113,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -30844,5 +31120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -30851,7 +31127,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aeroway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -30862,9 +31138,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 "aerovía"
@@ -30875,8 +31151,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 "terminal"
@@ -30887,5 +31163,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -30895,8 +31171,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 "pista (oscuro)"
@@ -30907,8 +31183,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 "pista (claro)"
@@ -30919,5 +31195,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -30926,5 +31202,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -30933,7 +31209,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aerialway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -30943,5 +31219,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -30951,5 +31227,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -30959,5 +31235,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -30967,5 +31243,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -30975,10 +31251,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 "pista de rodadura"
@@ -30989,11 +31265,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 "pista fácil"
@@ -31004,9 +31280,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 "pista intermedia"
@@ -31017,9 +31293,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 "pista avanzada"
@@ -31030,9 +31306,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 "pista para expertos"
@@ -31043,9 +31319,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 "pista de estilo libre"
@@ -31056,9 +31332,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 "pista para iniciados"
@@ -31069,7 +31345,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--power tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -31079,5 +31355,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -31086,5 +31362,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -31094,5 +31370,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -31102,5 +31378,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -31110,5 +31386,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -31118,5 +31394,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -31126,5 +31402,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -31134,5 +31410,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -31142,5 +31418,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -31150,5 +31426,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -31158,5 +31434,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -31166,5 +31442,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -31174,15 +31450,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 "energía"
@@ -31192,9 +31468,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 "muelle"
@@ -31205,8 +31481,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 "tubería"
@@ -31216,7 +31492,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--leisure tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -31226,5 +31502,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -31234,5 +31510,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -31242,5 +31518,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -31250,5 +31526,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -31258,5 +31534,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -31266,5 +31542,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -31274,5 +31550,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -31282,5 +31558,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -31290,5 +31566,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -31298,5 +31574,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -31306,5 +31582,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -31314,5 +31590,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -31322,5 +31598,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -31330,5 +31606,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -31338,5 +31614,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -31346,17 +31622,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 "ocio"
@@ -31366,9 +31642,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 "puerto deportivo"
@@ -31378,7 +31654,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--amenity tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -31388,5 +31664,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -31396,5 +31672,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -31404,5 +31680,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -31412,5 +31688,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -31420,5 +31696,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -31428,5 +31704,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -31436,5 +31712,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -31444,5 +31720,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -31452,5 +31728,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -31460,14 +31736,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 "servicios"
@@ -31477,5 +31753,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -31485,5 +31761,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -31493,5 +31769,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -31501,5 +31777,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -31509,5 +31785,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -31517,5 +31793,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -31525,5 +31801,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -31533,5 +31809,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -31541,5 +31817,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -31549,5 +31825,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -31557,5 +31833,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -31565,14 +31841,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 "tráfico de ocio"
@@ -31582,5 +31858,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -31589,5 +31865,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -31597,5 +31873,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -31604,5 +31880,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -31612,5 +31888,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -31620,5 +31896,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -31628,5 +31904,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -31635,5 +31911,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -31643,5 +31919,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -31651,5 +31927,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -31659,5 +31935,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -31667,5 +31943,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -31674,5 +31950,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -31681,5 +31957,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -31688,5 +31964,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -31695,5 +31971,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -31702,5 +31978,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -31709,5 +31985,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -31716,5 +31992,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -31723,5 +31999,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -31730,5 +32006,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -31737,5 +32013,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -31744,5 +32020,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -31751,5 +32027,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -31758,5 +32034,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -31766,5 +32042,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -31774,5 +32050,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -31782,5 +32058,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -31790,5 +32066,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -31798,5 +32074,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -31806,5 +32082,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -31814,5 +32090,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -31822,5 +32098,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -31830,5 +32106,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -31839,5 +32115,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -31847,5 +32123,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -31855,5 +32131,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -31863,5 +32139,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -31871,5 +32147,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -31879,5 +32155,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -31887,5 +32163,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -31895,5 +32171,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -31903,5 +32179,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -31911,5 +32187,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -31919,5 +32195,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -31927,5 +32203,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -31935,5 +32211,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -31943,5 +32219,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -31951,5 +32227,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -31959,5 +32235,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"/>
@@ -31967,5 +32251,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -31975,5 +32259,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -31983,5 +32267,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -31991,5 +32275,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -31998,27 +32282,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 "equipamiento lumínico"
@@ -32028,5 +32313,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -32036,5 +32321,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -32044,12 +32329,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 "agua (claro)"
@@ -32059,5 +32344,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -32067,5 +32352,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -32075,5 +32360,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -32083,5 +32368,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -32091,5 +32376,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -32099,5 +32384,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -32107,11 +32392,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 "salud"
@@ -32121,7 +32406,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--shop tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -32131,5 +32416,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -32139,5 +32424,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -32147,5 +32432,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -32155,5 +32440,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -32163,5 +32448,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -32171,5 +32456,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -32179,5 +32464,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -32187,5 +32472,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -32195,5 +32480,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -32203,5 +32488,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -32211,5 +32496,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -32219,5 +32504,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -32227,5 +32512,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -32235,5 +32520,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -32243,5 +32528,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -32251,5 +32536,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -32259,5 +32544,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -32267,5 +32552,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -32275,5 +32560,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -32283,5 +32568,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -32291,5 +32576,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -32299,5 +32584,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -32307,5 +32592,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -32315,5 +32600,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -32323,5 +32608,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -32331,5 +32616,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -32339,5 +32624,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -32347,5 +32632,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -32355,5 +32640,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -32363,5 +32648,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -32371,5 +32656,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -32379,5 +32664,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -32387,5 +32672,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -32395,5 +32680,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -32403,5 +32688,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -32411,5 +32696,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -32419,5 +32704,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -32427,5 +32712,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -32435,5 +32720,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -32443,5 +32728,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -32451,5 +32736,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -32459,31 +32744,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 "tienda"
@@ -32493,7 +32778,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--tourism tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -32503,5 +32788,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -32511,5 +32796,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -32519,5 +32804,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -32527,5 +32812,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -32535,5 +32820,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -32543,5 +32828,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -32551,12 +32836,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 "hotel"
@@ -32566,5 +32851,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -32574,5 +32859,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -32582,5 +32867,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -32590,5 +32875,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -32598,5 +32883,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -32606,5 +32891,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -32615,5 +32900,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -32623,5 +32908,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- information tags -->
 #. <rule>
@@ -32631,5 +32916,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -32639,5 +32924,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -32646,5 +32931,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -32653,13 +32938,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 "turismo"
@@ -32669,7 +32954,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--historic tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -32679,5 +32964,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -32687,5 +32972,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -32695,5 +32980,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -32703,5 +32988,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -32711,5 +32996,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -32719,5 +33004,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -32727,5 +33012,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -32735,5 +33020,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -32743,13 +33028,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 "patrimonio histórico"
@@ -32759,8 +33044,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 "cantera"
@@ -32771,8 +33056,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 "vertedero"
@@ -32783,5 +33068,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -32791,8 +33076,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 "cuenca"
@@ -32803,8 +33088,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 "edificio agrario"
@@ -32815,6 +33100,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
-#. 
+#.
+#.
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -32824,8 +33109,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 "venta al por menor"
@@ -32836,8 +33121,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 "industrial"
@@ -32848,8 +33133,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 "área postindustrial degradada"
@@ -32860,8 +33145,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 "área rururbana"
@@ -32872,8 +33157,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 "zona ferroviaria"
@@ -32884,5 +33169,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -32892,7 +33177,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--military tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -32902,5 +33187,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -32910,5 +33195,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -32918,5 +33203,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -32926,11 +33211,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 "zona militar"
@@ -32941,8 +33226,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 "cementerio"
@@ -32952,8 +33237,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 "pico"
@@ -32964,9 +33249,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 "glaciar"
@@ -32976,9 +33261,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 "volcán"
@@ -32988,5 +33273,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -32997,5 +33282,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -33005,5 +33290,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -33013,5 +33298,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -33021,5 +33306,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -33029,12 +33314,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 "espacio natural"
@@ -33044,9 +33329,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 "matorral"
@@ -33056,9 +33341,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 "monte"
@@ -33068,9 +33353,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 "área forestal"
@@ -33080,9 +33365,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 "lodazal"
@@ -33092,9 +33377,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 "playa"
@@ -33105,5 +33390,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?
@@ -33129,5 +33414,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -33138,11 +33423,11 @@
 #. </rule>
 #. -->
-#. 
+#.
 #. <!--name tags -->
-#. 
+#.
 #. <!--preferences tags -->
-#. 
+#.
 #. <!--place tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -33152,5 +33437,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -33160,5 +33445,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -33168,5 +33453,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -33176,5 +33461,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -33184,5 +33469,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -33192,5 +33477,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -33200,5 +33485,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -33208,5 +33493,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -33216,5 +33501,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -33224,5 +33509,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -33232,5 +33517,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -33240,15 +33525,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 "lugar"
@@ -33258,9 +33543,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 "datos_TIGER"
@@ -33351,5 +33636,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#. 
+#.
 #. Data type can be:
 #. node        - a node point
@@ -33357,28 +33642,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
@@ -33493,5 +33778,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#. 
+#.
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -33504,5 +33789,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>
@@ -33527,6 +33812,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#. 
-#. 
+#.
+#.
 #. only for Germany
 #: build/trans_wms.java:17
@@ -33535,6 +33820,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#. 
-#. 
+#.
+#.
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -33549,6 +33834,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
@@ -33562,6 +33847,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
@@ -33581,6 +33866,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#. 
-#. 
+#.
+#.
 #. only for Japan
 #: build/trans_wms.java:39
@@ -33604,6 +33889,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
@@ -33616,4 +33901,13 @@
 msgstr "Sicilia - Italia"
 
+#~ 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 ""
+#~ "Objeto con el ID {0} y version {1} es visible atravez de la fuente del "
+#~ "objeto con version anterior {2} no es visible. No podemos manejar esta "
+#~ "inconsistencia. Mantengo el objeto. "
+
 #~ msgid "Move"
 #~ msgstr "Mover"
@@ -33631,5 +33925,4 @@
 #~ msgstr "Correo Electrónico"
 
-#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "Contacto {0}..."
@@ -33647,5 +33940,4 @@
 #~ msgstr "Existieron conflictos durante la importación"
 
-#, java-format
 #~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
 #~ msgstr "No pudo leerse la hora \"{0}\" desde el punto {1} x {2}"
@@ -33653,15 +33945,13 @@
 #~ msgid "No images with readable timestamps found."
 #~ msgstr ""
-#~ "No se han encontrado imágenes con metadatos legibles sobre la fecha y hora."
-
-#, java-format
+#~ "No se han encontrado imágenes con metadatos legibles sobre la fecha y "
+#~ "hora."
+
 #~ msgid "GPS start: {0}"
 #~ msgstr "Iniciar GPS: {0}"
 
-#, java-format
 #~ msgid "GPS end: {0}"
 #~ msgstr "Finalizar GPS: {0}"
 
-#, java-format
 #~ msgid "No time for point {0} x {1}"
 #~ msgstr "No hay hora para el punto {0} x {1}"
@@ -33673,9 +33963,7 @@
 #~ msgstr "Introduce la fecha mostrada (mm/dd/aaaa HH:MM:SS)"
 
-#, java-format
 #~ msgid "There is no EXIF time within the file \"{0}\"."
 #~ msgstr "No hay datos sobre la hora en la cabecera EXIF del archivo \"{0}\"."
 
-#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "No se puede abrir el directorio de preferencias: {0}"
@@ -33699,6 +33987,6 @@
 #~ "Login password to the OSM account. Leave blank to not store any password."
 #~ msgstr ""
-#~ "Validar contraseña de la cuenta OSM. Dejar en blanco para no guardar ninguna "
-#~ "clave."
+#~ "Validar contraseña de la cuenta OSM. Dejar en blanco para no guardar "
+#~ "ninguna clave."
 
 #~ msgid "Unknown version"
@@ -33728,5 +34016,4 @@
 #~ msgstr "diferencia de zona horaria: "
 
-#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} dentro de la traza."
@@ -33735,5 +34022,4 @@
 #~ msgstr "Sincronizar reloj"
 
-#, java-format
 #~ msgid "The date in file \"{0}\" could not be parsed."
 #~ msgstr ""
@@ -33756,5 +34042,4 @@
 #~ "Aviso: Algunos cambios provienen de nuevos datos subidos al servidor."
 
-#, java-format
 #~ msgid "current delta: {0}s"
 #~ msgstr "delta actual: {0}s"
@@ -33763,5 +34048,4 @@
 #~ msgstr "Por favor, seleccione al menos una tarea para descargar"
 
-#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Error mientras se cargaba la página {0}"
@@ -33770,5 +34054,4 @@
 #~ msgstr "Abrir en el navegador"
 
-#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Complemento no encontrado: {0}."
@@ -33781,5 +34064,4 @@
 #~ "aviso<br>cambiando la opción de configuración 'pluginmanager.warntime'.)"
 
-#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "El complemento requiere actualizar JOSM: {0}."
@@ -33818,9 +34100,7 @@
 #~ msgstr "Seleccione un marcador primero."
 
-#, java-format
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "Usar preferencia ''{0}'' del grupo ''{1}''"
 
-#, java-format
 #~ msgid "Use preset ''{0}''"
 #~ msgstr "Usar preferencia ''{0}''"
@@ -33830,11 +34110,10 @@
 
 #~ 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 ""
 #~ "Activar los complementos actualizados a fallado. Compruebe si JOSM tiene "
 #~ "permiso para escribir sobre los existentes"
 
-#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -33843,5 +34122,6 @@
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you load\n"
+#~ "Parameters are read in the order they are specified, so make sure you "
+#~ "load\n"
 #~ "some data before --selection"
 #~ msgstr ""
@@ -33852,5 +34132,4 @@
 #~ msgstr "En vez de  --bajar=<bbox> puede especificar osm://<bbox>\n"
 
-#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -33862,9 +34141,9 @@
 #~ " {0}"
 
-#, java-format
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
 #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
 #~ msgstr[0] ""
-#~ "El complemento {0} se ha actualizado correctamente. Por favor reinicie JOSM"
+#~ "El complemento {0} se ha actualizado correctamente. Por favor reinicie "
+#~ "JOSM"
 #~ msgstr[1] ""
 #~ "Los complementos {0} se han actualizado correctamente. Por favor reinicie "
@@ -33874,9 +34153,7 @@
 #~ msgstr "Actualizar complementos"
 
-#, java-format
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "No se ha podido bajar el complemento: {0} al {1}"
 
-#, java-format
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Resolver conflictos {0} en objetos {1}"
@@ -33943,5 +34220,4 @@
 #~ msgstr "Error analizando la respuesta del servidor"
 
-#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Por favor presente una \"ticket\" en {0}"
@@ -33951,6 +34227,6 @@
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version selected "
-#~ "in the history list."
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
 #~ msgstr ""
 #~ "Revertir el estado de todos los objetos actualmente seleccionados a la "
@@ -33963,5 +34239,4 @@
 #~ msgstr "Zona horaria del GPS (diferencia con la foto)"
 
-#, java-format
 #~ msgid "Images for {0}"
 #~ msgstr "Imágenes para {0}"
@@ -33973,5 +34248,4 @@
 #~ msgstr "La URL base del servidor OSM (REST API)"
 
-#, java-format
 #~ msgid "Downloaded plugin information from {0} site"
 #~ msgid_plural "Downloaded plugin information from {0} sites"
@@ -34025,9 +34299,9 @@
 
 #~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this as "
-#~ "a bug."
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
 #~ msgstr ""
-#~ "Error interno: no se pueden comprobar las condiciones para ninguna capa. Por "
-#~ "favor comunique esto como fallo."
+#~ "Error interno: no se pueden comprobar las condiciones para ninguna capa. "
+#~ "Por favor comunique esto como fallo."
 
 #~ msgid "Only two nodes allowed"
@@ -34039,5 +34313,6 @@
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
 #~ msgstr ""
-#~ "Puede usar el ratón o las teclas Ctrl+Flecha para hacer zoom y desplazamiento"
+#~ "Puede usar el ratón o las teclas Ctrl+Flecha para hacer zoom y "
+#~ "desplazamiento"
 
 #~ msgid "Tagging preset source"
@@ -34096,8 +34371,9 @@
 
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want to "
-#~ "combine them?"
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
 #~ msgstr ""
-#~ "Las vías seleccionadas tienen diferentes relaciones. ¿Aún quiere combinarlas?"
+#~ "Las vías seleccionadas tienen diferentes relaciones. ¿Aún quiere "
+#~ "combinarlas?"
 
 #~ msgid "Copy Default"
@@ -34122,18 +34398,20 @@
 #~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
 #~ msgstr ""
-#~ "<html>No puedo tomar una imagen de mi receptor GPS <br>¿Puede "
-#~ "ayudarme?</html>"
+#~ "<html>No puedo tomar una imagen de mi receptor GPS <br>¿Puede ayudarme?</"
+#~ "html>"
 
 #~ msgid "Open images with AgPifoJ..."
 #~ msgstr "abrir imágenes con AgPifoJ..."
 
-#, java-format
-#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
+#~ msgid ""
+#~ "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them all?"
+#~ "The selection contains {0} ways. Are you sure you want to simplify them "
+#~ "all?"
 #~ msgstr[0] ""
 #~ "La selección contiene {0} vía. ¿Está seguro que quiere simplificarla?"
 #~ msgstr[1] ""
-#~ "La selección contiene {0} vías. ¿Está seguro que quiere simplificarlas todas?"
+#~ "La selección contiene {0} vías. ¿Está seguro que quiere simplificarlas "
+#~ "todas?"
 
 #~ msgid "Show Tile Status"
@@ -34172,6 +34450,6 @@
 
 #~ 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 ""
 #~ "Intente actualizar a las últimas versiones de JOSM y de todos los "
@@ -34195,9 +34473,7 @@
 #~ "para ver ayuda."
 
-#, java-format
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "Imposible leer desde la URL: \"{0}\""
 
-#, java-format
 #~ msgid "Parsing error in URL: \"{0}\""
 #~ msgstr "Error de análisis sintáctico en URL: \"{0}\""
@@ -34233,21 +34509,16 @@
 #~ msgstr "Vía ciclable"
 
-#, java-format
 #~ msgid "No outer way for multipolygon ''{0}''."
 #~ msgstr "Ninguna vía exterior en el multipolígono ''{0}''."
 
-#, java-format
 #~ msgid "Inner way ''{0}'' is outside."
 #~ msgstr "La vía interior ''{0}'' se encuentra en la parte de fuera."
 
-#, java-format
 #~ msgid "Intersection between ways ''{0}'' and ''{1}''."
 #~ msgstr "Intersección entre las vías ''{0}'' y ''{1}''."
 
-#, java-format
 #~ msgid "Non-Way ''{0}'' in multipolygon."
 #~ msgstr "La no-vía ''{0}'' en multipolígono"
 
-#, java-format
 #~ msgid "Warning: {0}"
 #~ msgstr "Advertencia: {0}"
@@ -34265,5 +34536,4 @@
 #~ msgstr "Abrir página de usuario"
 
-#, java-format
 #~ msgid "Error: {0}"
 #~ msgstr "Error: {0}"
@@ -34275,11 +34545,11 @@
 #~ msgstr "Miembro vacío en la relación."
 
-#, 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 ""
-#~ "El complemento {0} parece roto o no se ha podido bajar de forma automática."
-
-#, java-format
+#~ "El complemento {0} parece roto o no se ha podido bajar de forma "
+#~ "automática."
+
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -34298,5 +34568,4 @@
 #~ msgstr "Subir a OSM..."
 
-#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -34305,6 +34574,6 @@
 #~ "{0}"
 #~ msgstr ""
-#~ "El archivo de complemento ya está disponible. ¿Quiere descargar la versión "
-#~ "actual borrando el archivo existente?\n"
+#~ "El archivo de complemento ya está disponible. ¿Quiere descargar la "
+#~ "versión actual borrando el archivo existente?\n"
 #~ "\n"
 #~ "{0}"
@@ -34335,11 +34604,10 @@
 
 #~ msgid "Track Grade 5"
-#~ msgstr "Pista de grado 5 (con rodaduras apenas visibles entre la vegetación)"
-
-#, java-format
+#~ msgstr ""
+#~ "Pista de grado 5 (con rodaduras apenas visibles entre la vegetación)"
+
 #~ msgid "Authors: {0}"
 #~ msgstr "Autores: {0}"
 
-#, java-format
 #~ msgid "Layers: {0}"
 #~ msgstr "Capas: {0}"
@@ -34348,13 +34616,10 @@
 #~ msgstr "Histórico del elemento"
 
-#, java-format
 #~ msgid "multipolygon way ''{0}'' is not closed."
 #~ msgstr "La vía multipoligonal ''{0}'' no está cerrada."
 
-#, java-format
 #~ msgid "Style for inner way ''{0}'' equals multipolygon."
 #~ msgstr "El estilo de la vía interior ''{0}'' es igual al del multipolígono"
 
-#, java-format
 #~ msgid "Style for outer way ''{0}'' mismatches."
 #~ msgstr "El estilo de la vía exterior ''{0}'' no coincide."
@@ -34385,5 +34650,4 @@
 #~ msgstr "acueducto"
 
-#, java-format
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr "Obviando una vía porque incluye un nodo que no existe: {0}\n"
@@ -34398,5 +34662,4 @@
 #~ msgstr "Eliminar seleccionados"
 
-#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Pila de comandos: {0}"
@@ -34423,5 +34686,4 @@
 #~ msgstr "Mueve hacia abajo"
 
-#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Editor de relación: {0}"
@@ -34433,5 +34695,4 @@
 #~ msgstr "Problema al dibujar"
 
-#, java-format
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
@@ -34453,6 +34714,6 @@
 #~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
 #~ msgstr ""
-#~ "ESTO ES EXPERIMENTAL. Guarde su trabajo y verifíquelo antes de la subirlo al "
-#~ "servidor."
+#~ "ESTO ES EXPERIMENTAL. Guarde su trabajo y verifíquelo antes de la subirlo "
+#~ "al servidor."
 
 #~ msgid "Replaces Selection with Users data"
@@ -34462,11 +34723,10 @@
 #~ msgstr "Valores por defecto"
 
-#, java-format
 #~ msgid "rectifier id={0}"
 #~ msgstr "rectificar id={0}"
 
 #~ msgid ""
-#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
-#~ "these will then show up in the WMS menu.\n"
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
 #~ "\n"
 #~ "You can also do this manually in the Advanced Preferences, using the "
@@ -34483,6 +34743,6 @@
 #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
 #~ "only need to input the relevant 'id'.\n"
-#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in "
-#~ "this example,replacing 73 with your image id: \n"
+#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
+#~ "in this example,replacing 73 with your image id: \n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -34492,6 +34752,6 @@
 #~ msgstr ""
 #~ "Puede añadir, editar y borrar entradas de servicios WMS en la pestaña "
-#~ "Preferencias del componente WMSplugin. Una vez modificado estos cambios se "
-#~ "mostrarán en el menú WMS.\n"
+#~ "Preferencias del componente WMSplugin. Una vez modificado estos cambios "
+#~ "se mostrarán en el menú WMS.\n"
 #~ "\n"
 #~ "También puede hacerlo manualmente en 'Preferencias avanzadas' usando el "
@@ -34506,7 +34766,7 @@
 #~ "format=image/jpeg \n"
 #~ "\n"
-#~ "Para el restificador de mapas de Metacarta "
-#~ "http://labs.metacarta.com/rectifier/ únicamente necesita introducir el "
-#~ "identificador 'id' que este servicio le proporciona.\n"
+#~ "Para el restificador de mapas de Metacarta http://labs.metacarta.com/"
+#~ "rectifier/ únicamente necesita introducir el identificador 'id' que este "
+#~ "servicio le proporciona.\n"
 #~ "Para agregar una imagen de un mapa rectificada mediante esta utilidad de "
 #~ "Metacarta sustituya en esta URL de ejemplo el número 73 por el id que "
@@ -34515,19 +34775,19 @@
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
 #~ " \n"
-#~ "Nota: Asegúrese que los derechos de autor de la imagen que vaya a utilizar "
-#~ "se adecúan a la licencia de OSM. Si duda, por favor, no la utilice."
+#~ "Nota: Asegúrese que los derechos de autor de la imagen que vaya a "
+#~ "utilizar se adecúan a la licencia de OSM. Si duda, por favor, no la "
+#~ "utilice."
 
 #~ msgid ""
-#~ "An error occured while trying to match the photos to the GPX track. You can "
-#~ "adjust the sliders to manually match the photos."
+#~ "An error occured while trying to match the photos to the GPX track. You "
+#~ "can adjust the sliders to manually match the photos."
 #~ msgstr ""
-#~ "Se ha producido un error al tratar de hacer coincidir las fotografías con la "
-#~ "traza GPX. Puede ajustarlo regulándolo manualmente para hacer coincidirlos.\""
-
-#, java-format
+#~ "Se ha producido un error al tratar de hacer coincidir las fotografías con "
+#~ "la traza GPX. Puede ajustarlo regulándolo manualmente para hacer "
+#~ "coincidirlos.\""
+
 #~ msgid "Offset between track and photos: {0}m {1}s"
 #~ msgstr "Diferencia temporal entre la traza y las fotografías: {0}m {1}s"
 
-#, java-format
 #~ msgid "Found {0} matches of {1} in GPX track {2}"
 #~ msgstr "Encontrado {0} coincidencias de{1} en la traza GPX {2}"
@@ -34571,5 +34831,6 @@
 #~ msgid "Edit Track of grade 5"
 #~ msgstr ""
-#~ "Editar pista de grado 5 (con rodaduras apenas visibles entre la vegetación)"
+#~ "Editar pista de grado 5 (con rodaduras apenas visibles entre la "
+#~ "vegetación)"
 
 #~ msgid "Edit Demanding Alpine Hiking"
@@ -34588,5 +34849,4 @@
 #~ msgstr "Se han producido los siguientes errores durante la descarga masiva:"
 
-#, java-format
 #~ msgid "Change the projection to {0} first."
 #~ msgstr "Cambia la proyección a {0} previamente."
@@ -34620,6 +34880,6 @@
 
 #~ msgid ""
-#~ "Tools to work with authors/users. Selects map data that belongs to selected "
-#~ "user, opens browser showing selected author profile page."
+#~ "Tools to work with authors/users. Selects map data that belongs to "
+#~ "selected user, opens browser showing selected author profile page."
 #~ msgstr ""
 #~ "Herramientas para trabajar con los autores/usuarios. Selecciona datos del "
@@ -34638,5 +34898,6 @@
 #~ msgstr ""
 #~ "Otro complemento de geoetiquetado para JOSM. Se relaciona las fotografías "
-#~ "con la traza del GPS o importa los metadatos geográficos EXIF de las fotos."
+#~ "con la traza del GPS o importa los metadatos geográficos EXIF de las "
+#~ "fotos."
 
 #~ msgid "Lambert Zone 3 cache file (.3)"
@@ -34648,10 +34909,10 @@
 #~ msgid ""
 #~ "The main feature of the plugin is the possibility to delete points of the "
-#~ "GPX track. This plugin can be used to prepare  tracks for uploading to OSM "
-#~ "eg. deleting uninteresting parts of track."
+#~ "GPX track. This plugin can be used to prepare  tracks for uploading to "
+#~ "OSM eg. deleting uninteresting parts of track."
 #~ msgstr ""
-#~ "La principal característica del componente es la posibilidad de eliminar los "
-#~ "puntos de una traza GPX. Se puede utilizar para preparar las trazas antes "
-#~ "subirlas a OSM para, por ejemplo, suprimir partes de la traza poco "
+#~ "La principal característica del componente es la posibilidad de eliminar "
+#~ "los puntos de una traza GPX. Se puede utilizar para preparar las trazas "
+#~ "antes subirlas a OSM para, por ejemplo, suprimir partes de la traza poco "
 #~ "interesantes."
 
@@ -34668,9 +34929,7 @@
 #~ msgstr "% de lon:"
 
-#, java-format
 #~ msgid "Image with path {0} does not exist or is not readable."
 #~ msgstr "Imagen con la ruta {0} no existe o no puede ser leida."
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -34697,15 +34956,13 @@
 #~ msgstr "Número de parámetros incorrecto para el operador de nodos."
 
-#, java-format
 #~ msgid "Incorrect value of id operator: {0}. Number is expected."
 #~ msgstr "Valor incorrecto del operador de ID: {0}. Se esperaba un número."
 
-#, java-format
 #~ msgid ""
 #~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
 #~ "nodes or range, for example nodes:10-20"
 #~ msgstr ""
-#~ "Valor incorrecto de operador de nodos: {0}. El operador de nodos espera un "
-#~ "número de nodos o un intervalo, por ejemplo nodos:10-20"
+#~ "Valor incorrecto de operador de nodos: {0}. El operador de nodos espera "
+#~ "un número de nodos o un intervalo, por ejemplo nodos:10-20"
 
 #~ msgid "JOSM Online Help"
@@ -34724,6 +34981,6 @@
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still want "
-#~ "to merge them?"
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
 #~ msgstr ""
 #~ "Los nodos seleccionados pertenecen a distintas relaciones. ¿Seguro que "
@@ -34741,7 +34998,9 @@
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data layer?"
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
 #~ msgstr ""
-#~ "No hay datos que actualizar. ¿Ha abierto o descargado ya una capa de datos?"
+#~ "No hay datos que actualizar. ¿Ha abierto o descargado ya una capa de "
+#~ "datos?"
 
 #~ msgid "Undeleting relation..."
@@ -34754,9 +35013,8 @@
 #~ msgstr "Actualización de selección"
 
-#, java-format
 #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
-#~ msgstr "Error de cabecera \"{0}\" no coincide con el patrón esperado \"{1}\""
-
-#, java-format
+#~ msgstr ""
+#~ "Error de cabecera \"{0}\" no coincide con el patrón esperado \"{1}\""
+
 #~ msgid ""
 #~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
@@ -34765,6 +35023,6 @@
 #~ msgstr ""
 #~ "<html> Subida<strong> fallada</ strong>debido a que ha intentado eliminar "
-#~ "una primitiva<br> en el servidor la cual ya está eliminada. <br> El mensaje "
-#~ "de error es: <br> {0} </ html>"
+#~ "una primitiva<br> en el servidor la cual ya está eliminada. <br> El "
+#~ "mensaje de error es: <br> {0} </ html>"
 
 #~ msgid "Conflict detected"
@@ -34783,5 +35041,4 @@
 #~ msgstr "Extender al final de la línea"
 
-#, java-format
 #~ msgid "Plugin {0} requires JOSM update to version {1}."
 #~ msgstr "El complemento {0} requiere una actualizar JOSM a la versión {1}"
@@ -34799,38 +35056,37 @@
 #~ msgstr ">"
 
-#, java-format
 #~ msgid "Checking whether primitive {0} is gone ..."
 #~ msgstr "Comprobando si falta el primitivo {0}..."
 
-#, java-format
 #~ msgid ""
-#~ "<html>The OSM primitive with id <strong>{0}</strong> has been deleted<br>on "
-#~ "the server by another mapper.<br><br>Click <strong>{1}</strong> to keep your "
-#~ "primitive and ignore the deleted state.<br>Your primitive will be assigend a "
-#~ "new id.<br>Click <strong>{2}</strong> to accept the state on the server and "
-#~ "to delete your primitive.<br>Click <strong>{3}</strong> to cancel.<br>"
+#~ "<html>The OSM primitive with id <strong>{0}</strong> has been "
+#~ "deleted<br>on the server by another mapper.<br><br>Click <strong>{1}</"
+#~ "strong> to keep your primitive and ignore the deleted state.<br>Your "
+#~ "primitive will be assigend a new id.<br>Click <strong>{2}</strong> to "
+#~ "accept the state on the server and to delete your primitive.<br>Click "
+#~ "<strong>{3}</strong> to cancel.<br>"
 #~ msgstr ""
-#~ "<html>El primitivo de OSM con ID <strong>{0}</strong> ha sido borrado<br>en "
-#~ "el servidor por otro mapeador.<br><br>Pulse <strong>{1}</strong> para "
-#~ "mantener su primitivo e ignorar el estado de borrado.<br>Se asignará una "
-#~ "nueva ID a su primitivo.<br>Pulse <strong>{2}</strong> para aceptar el "
-#~ "estado en el servidor y borrar su primitivo.<br>Pulse <strong>{3}</strong> "
-#~ "para cancelar.<br>"
-
-#, java-format
+#~ "<html>El primitivo de OSM con ID <strong>{0}</strong> ha sido "
+#~ "borrado<br>en el servidor por otro mapeador.<br><br>Pulse <strong>{1}</"
+#~ "strong> para mantener su primitivo e ignorar el estado de borrado.<br>Se "
+#~ "asignará una nueva ID a su primitivo.<br>Pulse <strong>{2}</strong> para "
+#~ "aceptar el estado en el servidor y borrar su primitivo.<br>Pulse <strong>"
+#~ "{3}</strong> para cancelar.<br>"
+
 #~ msgid "Checking whether node {0} is gone ..."
 #~ msgstr "Comprobando si falta el nodo {0}..."
 
-#, java-format
 #~ msgid ""
-#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for individual "
-#~ "update. Please reduce the selection<br>to max. {1} primitives.</html>"
+#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
+#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
+#~ "</html>"
 #~ msgstr ""
 #~ "<html>Hay  <strong>{0}</strong> primitivos <br>seleccionados para "
-#~ "actualización individual. Por favor, reduzca la selección<br>a un máximo de "
-#~ "{1} primitivos.</html>"
+#~ "actualización individual. Por favor, reduzca la selección<br>a un máximo "
+#~ "de {1} primitivos.</html>"
 
 #~ msgid "Updates the currently selected primitives from the server"
-#~ msgstr "Actualiza las primitivas seleccionadas actualmente desde el servidor"
+#~ msgstr ""
+#~ "Actualiza las primitivas seleccionadas actualmente desde el servidor"
 
 #~ msgid "relations"
@@ -34845,5 +35101,6 @@
 #~ msgid "Failed to initialize API. Please try again later."
 #~ msgstr ""
-#~ "No se ha podido inicializar la API. Por favor, inténtelo de nuevo más tarde."
+#~ "No se ha podido inicializar la API. Por favor, inténtelo de nuevo más "
+#~ "tarde."
 
 #~ msgid "parameter '{0}' must not be null"
@@ -34859,18 +35116,17 @@
 #~ msgstr "Errores durante la descarga"
 
-#, java-format
 #~ msgid ""
 #~ "<html>There are {0} primitives in your local dataset which<br>might be "
 #~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
-#~ "to check the state of these primitives<br>on the server.<br>Click "
+#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
+#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
 #~ "<strong>{2}</strong> to ignore.<br></html>"
 #~ msgstr ""
-#~ "<html>Hay {0} primitivas en su conjunto local de datos que<br>pueden estar "
-#~ "borradas en el servidor. Si posteriormente trata de borrarlas "
-#~ "o<br>actualizarlas probablemente el servidor informará de "
-#~ "un<br>conflicto.<br><br>Pulse <strong>{1}</strong> para comprobar el estado "
-#~ "de estas primitivas<br>en el servidor-<br>Pulse <strong>{2}</strong> para "
-#~ "ignorar.<br></html>"
+#~ "<html>Hay {0} primitivas en su conjunto local de datos que<br>pueden "
+#~ "estar borradas en el servidor. Si posteriormente trata de borrarlas "
+#~ "o<br>actualizarlas probablemente el servidor informará de un<br>conflicto."
+#~ "<br><br>Pulse <strong>{1}</strong> para comprobar el estado de estas "
+#~ "primitivas<br>en el servidor-<br>Pulse <strong>{2}</strong> para ignorar."
+#~ "<br></html>"
 
 #~ msgid "Validate either current selection or complete dataset."
@@ -34883,5 +35139,4 @@
 #~ msgstr "WGS84 Geográfico"
 
-#, java-format
 #~ msgid "Members: {0} (linked: {1})"
 #~ msgstr "Miembros: {0} (enlazados: {1})"
@@ -34893,5 +35148,4 @@
 #~ msgstr "Cargar selección"
 
-#, java-format
 #~ msgid "removing reference from way {0}"
 #~ msgstr "eliminando referencia de la vía {0}"
@@ -34899,6 +35153,6 @@
 #~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
 #~ msgstr ""
-#~ "No se encontró ninguna primitiva con ID {0} y versión {1} en este conjunto "
-#~ "de datos"
+#~ "No se encontró ninguna primitiva con ID {0} y versión {1} en este "
+#~ "conjunto de datos"
 
 #~ msgid "No data"
@@ -34914,5 +35168,4 @@
 #~ msgstr "Se ha encontrado más de una vía \"desde\"."
 
-#, java-format
 #~ msgid "Way ''{0}'' with less than two points."
 #~ msgstr "Vía ''{0}''  con menos de dos puntos."
@@ -34924,5 +35177,4 @@
 #~ msgstr "Vía de tipo área sin cerrar"
 
-#, java-format
 #~ msgid "Unknown member type for ''{0}''."
 #~ msgstr "Tipo de miembro \"{0}\" desconocido."
@@ -34934,5 +35186,4 @@
 #~ msgstr "No se ha encontrado ningún nodo o vía con el rol \"vía\"."
 
-#, java-format
 #~ msgid "Style for restriction {0} not found."
 #~ msgstr "No se ha encontrado el estilo para la restricción {0}."
@@ -34948,16 +35199,16 @@
 
 #~ msgid ""
-#~ "You are about to delete nodes outside of the area you have "
-#~ "downloaded.<br>This can cause problems because other objects (that you don't "
-#~ "see) might use them.<br>Do you really want to delete?"
+#~ "You are about to delete nodes outside of the area you have downloaded."
+#~ "<br>This can cause problems because other objects (that you don't see) "
+#~ "might use them.<br>Do you really want to delete?"
 #~ msgstr ""
 #~ "Está a punto de borrar nodos fuera del área que se ha descargado.<br>Esto "
-#~ "puede causar problemas ya que otros objetos (que no puede ver) pueden estar "
-#~ "usándolos.<br>¿Esta seguro que quiere borrarlo?"
-
-#, java-format
+#~ "puede causar problemas ya que otros objetos (que no puede ver) pueden "
+#~ "estar usándolos.<br>¿Esta seguro que quiere borrarlo?"
+
 #~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
 #~ msgstr ""
-#~ "<html>Fallo al cargar el historial desde el servidor. Detalles:<br>{0}</html>"
+#~ "<html>Fallo al cargar el historial desde el servidor. Detalles:<br>{0}</"
+#~ "html>"
 
 #~ msgid "Download referrers from OSM..."
@@ -34974,29 +35225,27 @@
 
 #~ msgid ""
-#~ "Enable to upload all changes in one request, disable to use one request per "
-#~ "changed primitive"
+#~ "Enable to upload all changes in one request, disable to use one request "
+#~ "per changed primitive"
 #~ msgstr ""
 #~ "Permitir subir todos los cambios en una petición, no permitir usar una "
 #~ "petición por cambio sencillo"
 
-#, java-format
 #~ msgid ""
 #~ "WARNING: launching browser windows for the first {0} of {1} selected "
 #~ "primitives only"
 #~ msgstr ""
-#~ "ADVERTENCIA: lanzamiento de las ventanas del navegador por primera vez {0} "
-#~ "de {1} solo seleccionados primitivos"
-
-#, java-format
+#~ "ADVERTENCIA: lanzamiento de las ventanas del navegador por primera vez "
+#~ "{0} de {1} solo seleccionados primitivos"
+
 #~ msgid ""
 #~ "Current number of changes exceeds the max. number of changes, current is "
 #~ "{0}, max is {1}"
 #~ msgstr ""
-#~ "El número de modificaciones actuales supera el máximo de modificaciones, el "
-#~ "actual es {0}, el máximo es {1}"
-
-#, java-format
+#~ "El número de modificaciones actuales supera el máximo de modificaciones, "
+#~ "el actual es {0}, el máximo es {1}"
+
 #~ msgid "Plug-in named {0} is not available. Update skipped."
-#~ msgstr "El complemento llamado {0} no está disponible. Omitir actualización."
+#~ msgstr ""
+#~ "El complemento llamado {0} no está disponible. Omitir actualización."
 
 #~ msgid "Can't search because there is no loaded data."
@@ -35006,9 +35255,9 @@
 #~ msgstr "Diálogo no creado todavía. Invocar primero createInstance()"
 
-#, java-format
 #~ msgid ""
 #~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
 #~ msgstr ""
-#~ "Hay cambios singrabar en la capa ''{0}''. ¿Eliminar la capa de todas formas?"
+#~ "Hay cambios singrabar en la capa ''{0}''. ¿Eliminar la capa de todas "
+#~ "formas?"
 
 #~ msgid "Confirmation"
@@ -35019,20 +35268,19 @@
 
 #~ msgid ""
-#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
-#~ "the following\n"
+#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to "
+#~ "add the following\n"
 #~ "      Java option to increase the maximum size of allocated memory"
 #~ msgstr ""
-#~ "nota: Para algunas tareas, JOSM necesita mucha memoria. Puede ser necesario "
-#~ "el añadir la siguiente \n"
+#~ "nota: Para algunas tareas, JOSM necesita mucha memoria. Puede ser "
+#~ "necesario el añadir la siguiente \n"
 #~ "      opción de Java para incrementar el tamaño máximo de la memoria "
 #~ "utilizada."
 
-#, java-format
 #~ msgid ""
 #~ "<html>Failed to create an URL because the encoding ''{0}'' was<br>was "
 #~ "missing on this system.</html>"
 #~ msgstr ""
-#~ "<html>Fallo al crear una URL porque la codificación ''{0}'' <br>no existe en "
-#~ "este sistema.</html>"
+#~ "<html>Fallo al crear una URL porque la codificación ''{0}'' <br>no existe "
+#~ "en este sistema.</html>"
 
 #~ msgid "Use a new changeset and close it"
@@ -35042,10 +35290,8 @@
 #~ msgstr "Cerrar el actual conjunto de cambios"
 
-#, java-format
 #~ msgid "Use the existing changeset {0} and close it after upload"
 #~ msgstr ""
 #~ "Usar el conjunto de cambios existente {0} y cerrarlo después de subir"
 
-#, java-format
 #~ msgid ""
 #~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
@@ -35053,14 +35299,13 @@
 #~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
 #~ msgstr[0] ""
-#~ "Existen cambios sin guardar en la capa {0}. ¿Desea descartar los cambios y "
-#~ "continuar?"
+#~ "Existen cambios sin guardar en la capa {0}. ¿Desea descartar los cambios "
+#~ "y continuar?"
 #~ msgstr[1] ""
-#~ "Existen cambios sin guardar en las capas {0}. ¿Desea descartar los cambios y "
-#~ "continuar?"
+#~ "Existen cambios sin guardar en las capas {0}. ¿Desea descartar los "
+#~ "cambios y continuar?"
 
 #~ msgid "Always move and don't show dialog again"
 #~ msgstr "Siempre mover y no mostrar la ventana de diálogo de nuevo"
 
-#, java-format
 #~ msgid ""
 #~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
@@ -35070,19 +35315,17 @@
 #~ "corregirlos primero.</html>"
 
-#, java-format
 #~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-#~ msgstr "Error en la sintáxis del patrón: ¡el patrón {0} de {1} no es válido!"
-
-#, java-format
+#~ msgstr ""
+#~ "Error en la sintáxis del patrón: ¡el patrón {0} de {1} no es válido!"
+
 #~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr "Falta la página de ayuda. Créela en <A HREF=\"{0}\">English</A>."
 
-#, java-format
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
 #~ msgstr ""
-#~ "Falta la página de ayuda. Créela en <A HREF=\"{0}\">English</A> o <A "
-#~ "HREF=\"{1}\">su idioma</A>."
+#~ "Falta la página de ayuda. Créela en <A HREF=\"{0}\">English</A> o <A HREF="
+#~ "\"{1}\">su idioma</A>."
 
 #~ msgid "Didn't find an primitive with id {0} in this dataset"
@@ -35094,27 +35337,22 @@
 
 #~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
 #~ msgstr ""
 #~ "Página de ayuda perdida. Crearla en <A HREF=\"{0}\">English</A> or <A "
 #~ "HREF=\"{1}\">spanish</A>."
 
-#, java-format
 #~ msgid "Parameter ''{0}'' must not be null."
 #~ msgstr "el parámetro ''{0}'' no debe ser nulo"
 
-#, java-format
 #~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 #~ msgstr "Se esperaba instancia de OsmDataLayer o GpxLayer. Obtenida \"{0}\""
 
-#, java-format
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "Retorno de valor inexperado. Obtenido {0}"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
 #~ msgstr "parámetro \"{0}\" > 0 esperado, obtenido \"{1}\"."
 
-#, java-format
 #~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 #~ msgstr "el paremetro \"{0}\" no es una clase aceptable, obtenido \"{1}\""
@@ -35126,5 +35364,4 @@
 #~ msgstr "No hay ninguna versión válida en la fecha ''{0}'' en este historial"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 #~ msgstr ""
@@ -35138,21 +35375,16 @@
 #~ "no se encontró ninguna versión más reciente. El histórico está vacío."
 
-#, java-format
 #~ msgid "Parameter current out of range. Got {0}."
 #~ msgstr "pa´rametro actual fuera del rango: obtenido {0}"
 
-#, java-format
 #~ msgid "Unexpected column index. Got {0}."
 #~ msgstr "índice de columna inexperado. Obtenido {0}"
 
-#, java-format
 #~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
 #~ msgstr "El parámetro 'col' debe ser 0 o 1. Obtenido {0}"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' must not be empty."
 #~ msgstr "parámetro ''{0}'' no debe estar vacío"
 
-#, java-format
 #~ msgid "Index out of bounds. Got {0}."
 #~ msgstr "índice fuera de los límites. Obtenido {0}"
@@ -35161,38 +35393,33 @@
 #~ msgstr "Mostrando el historial de la primitiva seleccionada"
 
-#, java-format
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "No se pudo leer \"{0}\""
 
-#, java-format
 #~ msgid ""
 #~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
 #~ msgstr ""
-#~ "valor ilegal para al atributo obligatorio \"{0}\" de tipo entero, obtenido "
-#~ "\"{1}\""
-
-#, java-format
+#~ "valor ilegal para al atributo obligatorio \"{0}\" de tipo entero, "
+#~ "obtenido \"{1}\""
+
 #~ msgid ""
-#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
+#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got "
+#~ "''{1}''."
 #~ msgstr ""
 #~ "valor ilegal para al atributo obligatorio \"{0}\" de tipo entero (>=0), "
 #~ "obtenido \"{1}\""
 
-#, java-format
 #~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 #~ msgstr "parámetro ''{0}'' >= 0 esperado, obtenido ''{1}'"
 
-#, java-format
 #~ msgid ""
 #~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
 #~ "relation?</html>"
 #~ msgstr ""
-#~ "<html>La selección \"{0}\" se utiliza en la relación \"{1}\".<br>¿Eliminar "
-#~ "de la relación?</html>"
+#~ "<html>La selección \"{0}\" se utiliza en la relación \"{1}\"."
+#~ "<br>¿Eliminar de la relación?</html>"
 
 #~ msgid "Bridleway"
 #~ msgstr "Vía ecuestre"
 
-#, java-format
 #~ msgid "Expected ID >= 0. Got {0}."
 #~ msgstr "Se esperaba un ID >=0. Obtenido {0}"
@@ -35203,23 +35430,20 @@
 #~ msgid "Group common Address Interpolation inputs in a single dialog,"
 #~ msgstr ""
-#~ "Agrupar las entradas comunes de \tinterpolación de direcciones en un único "
-#~ "diálogo,"
+#~ "Agrupar las entradas comunes de \tinterpolación de direcciones en un "
+#~ "único diálogo,"
 
 #~ msgid "Replace"
 #~ msgstr "Reemplazar"
 
-#, java-format
 #~ msgid "No useful role ''{0}'' for Way ''{1}''."
 #~ msgstr "La función \"{0}\" no es útil para el tramo \"{1}\"."
 
-#, java-format
 #~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-#~ "from relation?</html>"
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
 #~ msgstr ""
-#~ "<html>La selección \"{0}\" se utiliza en la relación \"{1}\" con la función "
-#~ "{2}.<br>¿Eliminar de la relación?</html>"
-
-#, java-format
+#~ "<html>La selección \"{0}\" se utiliza en la relación \"{1}\" con la "
+#~ "función {2}.<br>¿Eliminar de la relación?</html>"
+
 #~ msgid "Unknown role ''{0}''."
 #~ msgstr "Función ''{0}'' desconocida."
@@ -35228,5 +35452,4 @@
 #~ msgstr "Aplicar también a los niños"
 
-#, java-format
 #~ msgid "Relation: from {0} to {1} via {2}"
 #~ msgstr "Relación: desde {0} a {1} a través de {2}"
@@ -35246,30 +35469,28 @@
 #~ msgstr "<html>"
 
-#, java-format
 #~ msgid ""
 #~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
 #~ msgstr ""
-#~ "No se puede deshacer la operación \"{0}\" porque la capa \"{1}\"  ya no está "
-#~ "presente."
+#~ "No se puede deshacer la operación \"{0}\" porque la capa \"{1}\"  ya no "
+#~ "está presente."
 
 #~ msgid "Current changeset is null. Can't upload data."
-#~ msgstr "El conjunto de cambios actual es nulo. Los datos no se pueden subir."
+#~ msgstr ""
+#~ "El conjunto de cambios actual es nulo. Los datos no se pueden subir."
 
 #~ msgid "Defaults (See tooltip for detailed information)"
 #~ msgstr "Por defecto (vea el texto emergente para información más detallada)"
 
-#, java-format
 #~ msgid "The XML source (URL or filename) for {0} definition files."
 #~ msgstr ""
-#~ "La fuente XML (URL o ruta del archivo) para los archivos de definición {0}."
+#~ "La fuente XML (URL o ruta del archivo) para los archivos de definición "
+#~ "{0}."
 
 #~ msgid "Updating primitive"
 #~ msgstr "Oinarrizkoa eguneratzen"
 
-#, java-format
 #~ msgid "Id > 0 required, got {0}"
 #~ msgstr "Requreido ID > 0, obtenido {0}"
 
-#, java-format
 #~ msgid "{0} Plugin successfully downloaded."
 #~ msgid_plural "{0} Plugins successfully downloaded."
@@ -35280,9 +35501,7 @@
 #~ msgstr "Número de parámetros erróneos para las etiquetas de operador"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' must not be empty"
 #~ msgstr "El párametro ''{0}'' no debe estar vacío"
 
-#, java-format
 #~ msgid "Illegal double value ''{0}''"
 #~ msgstr "Valor doble ''{0}'' ilegal"
@@ -35291,27 +35510,23 @@
 #~ msgstr "Por favor, reinicia JOSM"
 
-#, java-format
 #~ msgid "Uploading {0} objects ..."
 #~ msgstr "Subiendo {0} objetos..."
 
-#, java-format
 #~ msgid ""
-#~ "Incorrect value of tags operator: {0}. Tags operator expects number of tags "
-#~ "or range, for example tags:1 or tags:2-5"
+#~ "Incorrect value of tags operator: {0}. Tags operator expects number of "
+#~ "tags or range, for example tags:1 or tags:2-5"
 #~ msgstr ""
-#~ "Valor incorrecto del operador tags: {0}. El operado tags espera un numero o "
-#~ "rango de etiquetas, por ejemplo tags:1 o tags:2-5"
-
-#, java-format
+#~ "Valor incorrecto del operador tags: {0}. El operado tags espera un numero "
+#~ "o rango de etiquetas, por ejemplo tags:1 o tags:2-5"
+
 #~ msgid "Expected array of length 4, got {0}"
 #~ msgstr "Esperada una matriz de longitud 4, obtenida {0}"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
 #~ msgstr "Paŕametro esperado ''{0}'' > 0, obtenido {1}"
 
 #~ msgid ""
-#~ "Several utilities that make your life easier: e.g. simplify way, join areas, "
-#~ "jump to position."
+#~ "Several utilities that make your life easier: e.g. simplify way, join "
+#~ "areas, jump to position."
 #~ msgstr ""
 #~ "Varias utilidades que hacen la vida en JOSM mucho más fácil: por ejemplo, "
@@ -35320,7 +35535,4 @@
 #~ msgid "Motorboat"
 #~ msgstr "Embarcación a motor"
-
-#~ msgid "Are you sure?"
-#~ msgstr "¿Está seguro?"
 
 #~ msgid ""
@@ -35329,10 +35541,9 @@
 #~ "Hold left mousebutton and draw a frame."
 #~ msgstr ""
-#~ "<b>Zoom:</b> Rueda del ratón, doble clic o Ctrl + Arriba/Abajo <b>Mover el "
-#~ "mapa:</b> Mantener el botón derecho pulsado y desplazar el ratón o usar las "
-#~ "teclas de cursor.<b> Seleccionar: </b> Mantener pulsado el botón izquierdo "
-#~ "del ratón para dibujar un marco de selección."
-
-#, java-format
+#~ "<b>Zoom:</b> Rueda del ratón, doble clic o Ctrl + Arriba/Abajo <b>Mover "
+#~ "el mapa:</b> Mantener el botón derecho pulsado y desplazar el ratón o "
+#~ "usar las teclas de cursor.<b> Seleccionar: </b> Mantener pulsado el botón "
+#~ "izquierdo del ratón para dibujar un marco de selección."
+
 #~ msgid "Incorrect value of version operator: {0}. Number is expected."
 #~ msgstr ""
@@ -35346,9 +35557,8 @@
 #~ "include all changesets in the query.</html>"
 #~ msgstr ""
-#~ "<html>Activar para restringir la consulta a las modificaciones "
-#~ "propias.<br>Desactivar para incluir todas las modificaciones en la "
-#~ "consulta.</html>"
-
-#, java-format
+#~ "<html>Activar para restringir la consulta a las modificaciones propias."
+#~ "<br>Desactivar para incluir todas las modificaciones en la consulta.</"
+#~ "html>"
+
 #~ msgid "Incorrect value of changeset operator: {0}. Number is expected."
 #~ msgstr ""
@@ -35376,6 +35586,6 @@
 #~ msgid "<html>Cannot open directory.<br>Please select a file!</html>"
 #~ msgstr ""
-#~ "<html>No se pudo abrir el directorio.<br>Por favor, seleccione un "
-#~ "archivo!</html>"
+#~ "<html>No se pudo abrir el directorio.<br>Por favor, seleccione un archivo!"
+#~ "</html>"
 
 #~ msgctxt "filter"
Index: /applications/editors/josm/i18n/po/et.po
===================================================================
--- /applications/editors/josm/i18n/po/et.po	(revision 21970)
+++ /applications/editors/josm/i18n/po/et.po	(revision 21971)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-15 18:25+0200\n"
-"PO-Revision-Date: 2010-06-09 18:57+0000\n"
+"POT-Creation-Date: 2010-06-23 22:47+0200\n"
+"PO-Revision-Date: 2010-06-15 18:14+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-06-15 16:21+0000\n"
+"X-Launchpad-Export-Date: 2010-06-23 20:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -23,5 +23,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
@@ -93,5 +93,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
@@ -250,5 +250,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
@@ -271,5 +271,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
@@ -277,6 +277,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
@@ -285,4 +287,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
@@ -405,4 +409,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
@@ -442,5 +447,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 "Info"
@@ -652,5 +657,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
@@ -665,5 +670,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 "Kustuta"
@@ -912,4 +917,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 ""
@@ -920,4 +926,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 ""
@@ -1472,6 +1479,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
@@ -1498,4 +1505,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
@@ -1504,6 +1513,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 "Viga"
@@ -1652,8 +1661,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 ""
@@ -1662,5 +1673,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 ""
@@ -1668,16 +1680,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 "Palun vali lihtsustamiseks vähemalt üks tee."
@@ -1686,13 +1703,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 "Jah"
 
 #: ../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 ""
@@ -1701,8 +1721,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"
@@ -1712,4 +1734,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)"
@@ -1996,5 +2019,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 "Pole muudatusi mida üles laadida."
@@ -2012,14 +2034,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 ""
@@ -2274,5 +2296,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
@@ -2890,10 +2912,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
@@ -3015,5 +3041,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
@@ -3137,11 +3163,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"
@@ -3150,5 +3176,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 #, java-format
 msgid ""
@@ -3157,5 +3183,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}"
@@ -3502,4 +3528,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}"
@@ -3511,29 +3540,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 ""
 
@@ -3612,19 +3635,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 ""
@@ -3633,5 +3656,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 "
@@ -3639,5 +3662,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 ""
@@ -3706,5 +3729,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 "valitud"
@@ -3991,5 +4014,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 ""
@@ -4076,5 +4099,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
@@ -4300,5 +4323,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
@@ -4307,4 +4330,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
@@ -4504,5 +4528,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
@@ -5148,10 +5172,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"
@@ -5160,10 +5186,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
@@ -5245,4 +5273,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 ""
@@ -5528,5 +5557,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
@@ -5625,5 +5654,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
@@ -5631,5 +5660,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 "Lisa"
@@ -5678,5 +5707,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 "Ajalugu"
@@ -5896,10 +5925,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 ""
@@ -7499,9 +7528,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 "Lisa seaded"
 
-#: ../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."
@@ -7510,23 +7539,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 "<erinev>"
 
-#: ../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 "Muuta väärtusi?"
 
-#: ../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"
@@ -7535,5 +7564,5 @@
 msgstr[1] "Muuda kuni {0} objekti seadeid"
 
-#: ../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."
@@ -7542,77 +7571,77 @@
 msgstr[1] "See muudab kuni {0} objekti."
 
-#: ../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 "Palun vali võti"
 
-#: ../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 "Palun vali väärtus"
 
-#: ../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 "Palun vali objektid mille seadeid soovid muuta."
 
-#: ../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 "Seaded/Liikmelisus"
 
-#: ../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 "Valitud objektide seaded"
 
 #. 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 "On liikmeks järgnevas"
 
-#: ../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 "Seaded: {0} / Liikmelisus: {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 "Seaded / Liikmelisus"
 
-#: ../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 "Muuda seost"
 
-#: ../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 "Tõesti soovid kustutada valikut seosest {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 "Kustuta valitud võti kõkides objektides"
 
-#: ../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 "Kustuda seadeid"
 
-#: ../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 "Lisa uus võtme/väärtuse paar kõikidele objektidele"
 
-#: ../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 "Muuda kõikide valitud objektide võtme väärtust"
 
-#: ../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 ""
@@ -8914,5 +8943,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 ""
@@ -9395,5 +9424,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..."
@@ -11065,5 +11094,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 "Palun vali rida kustutamiseks"
@@ -11543,5 +11572,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 ""
@@ -12005,5 +12034,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 ""
@@ -12013,10 +12042,10 @@
 
 #. 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 ""
@@ -12026,5 +12055,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
 #, java-format
 msgid ""
@@ -12033,5 +12062,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 ""
@@ -12040,5 +12069,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 ""
@@ -12047,9 +12076,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 ""
@@ -12494,4 +12523,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 "Muuda seadeid"
@@ -12675,5 +12705,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}''"
@@ -12953,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 ""
@@ -12964,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 "Sulgen muutustekogumit..."
 
-#: ../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}."
@@ -13204,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})"
@@ -14863,9 +14894,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 "Ehitised"
+
+#: ../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 "Kaardi seaded"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#, fuzzy
+msgid "Building tag:"
+msgstr "Hoone"
+
+#: ../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"
@@ -14874,35 +14924,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 "Avalik hoone"
+
+#: ../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 ""
 
@@ -15123,8 +15182,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 ""
@@ -15185,6 +15244,6 @@
 #. <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 "aadress"
@@ -15642,6 +15701,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 "Tühi kiht"
@@ -15823,4 +15882,50 @@
 msgid "No GPX data layer found."
 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 "Vali kool"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#, fuzzy
+msgid "Name:"
+msgstr "Nimi"
+
+#: ../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 "Kas oled kindel?"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
+msgid "New tool..."
+msgstr ""
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
+#, fuzzy
+msgid "Install"
+msgstr "Tööstus"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
@@ -17049,5 +17154,5 @@
 msgstr "Taasta"
 
-#: ../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}"
@@ -17097,4 +17202,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 "LIsandprogrammide  laadimine"
+
+#: ../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 "Ei saa lugeda sildistamise eelseadeid: {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 "Valik: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:111
+#, java-format
+msgid "Additional sign {0}"
 msgstr ""
 
@@ -17202,4 +17344,14 @@
 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 "Lihtsusta tee"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
+msgid "Delete unnecessary nodes from an area."
+msgstr ""
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
 msgid "Slippy Map"
@@ -19096,5 +19248,5 @@
 #. <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 ""
@@ -19190,11 +19342,143 @@
 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 "Heli import"
+
+#: ../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 "Eemalda"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
+msgid "removes current video from layer"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
+#, fuzzy
+msgid "play/pause"
+msgstr "Esita /paus"
+
+#: ../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 "taust"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
+#, fuzzy
+msgid "jumps n sec back"
+msgstr "Hüppa tagasi"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "forward"
+msgstr "Edasi"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "jumps n sec forward"
+msgstr "Hüppa edasi"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
+#, fuzzy
+msgid "faster"
+msgstr "Kiiremini"
+
+#: ../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 "Aeglasemalt"
+
+#: ../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
+msgid "loops n sec around current position"
+msgstr ""
+
+#. 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
+#, fuzzy
+msgid "Jump length"
+msgstr "Hüpe sinna"
+
+#: ../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 "kiht"
+
+#: ../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 ""
 
@@ -19407,28 +19691,28 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
 msgid "Automatic downloading"
 msgstr ""
 
-#: ../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 ""
@@ -19439,113 +19723,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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Ava tühi WMS kiht andmete laadimiseks failist"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
 msgid "WMS Plugin Preferences"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -19561,4 +19845,8 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
 msgid "% of north:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186
+msgid "Simultaneous connections"
 msgstr ""
 
@@ -19622,5 +19910,5 @@
 #. <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 "kultuurmets"
@@ -19715,12 +20003,12 @@
 #. <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 "piir"
@@ -19804,9 +20092,9 @@
 #. <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 "teekond"
@@ -20083,20 +20371,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:24
+#: 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 "
@@ -20106,10 +20394,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:34
 msgid "Helps vectorizing WMS images."
 msgstr "Aitab WMS kujutisi vektoriseerida"
 
 #. 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."
@@ -20117,5 +20405,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 "
@@ -20125,15 +20413,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 "
@@ -20142,5 +20430,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 "
@@ -20150,15 +20438,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"
@@ -20166,5 +20454,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."
@@ -20172,5 +20460,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 "
@@ -20179,5 +20467,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 "
@@ -20186,10 +20474,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."
@@ -20197,15 +20485,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 "
@@ -20214,10 +20503,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 "
@@ -20226,15 +20522,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 "
@@ -20244,10 +20540,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). "
@@ -20256,5 +20552,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) "
@@ -20263,5 +20559,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:89
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20270,10 +20566,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 "
@@ -20282,5 +20578,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 "
@@ -20290,5 +20586,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:97
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20297,15 +20593,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 "
@@ -20314,5 +20610,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:105
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21207,5 +21503,5 @@
 #. <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 ""
@@ -21668,5 +21964,5 @@
 #. <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 ""
@@ -21701,5 +21997,5 @@
 #. <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 ""
@@ -21733,6 +22029,6 @@
 #. <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 ""
@@ -22742,5 +23038,5 @@
 #. <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 ""
@@ -23133,9 +23429,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 "raudtee"
@@ -25306,28 +25602,28 @@
 #: 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 ""
@@ -27074,9 +27370,9 @@
 #. <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 "roheala"
@@ -28515,8 +28811,16 @@
 #. </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>
@@ -28528,4 +28832,13 @@
 #. <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 -->
@@ -28573,7 +28886,8 @@
 #: 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 "jalgrattaga"
@@ -28633,4 +28947,12 @@
 #. <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>
@@ -28651,6 +28973,7 @@
 #: 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 "jalgsi"
@@ -28672,5 +28995,5 @@
 #. <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 "metroo"
@@ -28966,5 +29289,5 @@
 #: 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 "kasutusest väljas"
@@ -29347,7 +29670,7 @@
 #. <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 "teerada"
@@ -29439,5 +29762,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:842
+#: build/trans_style.java:867
 msgid "services"
 msgstr "teenused"
@@ -29451,5 +29774,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:850
+#: build/trans_style.java:875
 msgid "ford"
 msgstr ""
@@ -29470,5 +29793,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:865
+#: build/trans_style.java:890
 msgid "turningcircle"
 msgstr "tagasipööramisring"
@@ -29483,5 +29806,5 @@
 #. <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 ""
@@ -29496,5 +29819,5 @@
 #. <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 "jõekallas"
@@ -29508,5 +29831,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:1018
+#: build/trans_style.java:1043
 msgid "stream"
 msgstr "oja"
@@ -29520,5 +29843,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1041
+#: build/trans_style.java:1066
 msgid "dock"
 msgstr "dokk"
@@ -29715,14 +30038,14 @@
 #. <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 "inimtekkeline"
@@ -29736,5 +30059,5 @@
 #. <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 ""
@@ -29796,7 +30119,7 @@
 #. <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 ""
@@ -29819,10 +30142,10 @@
 #. <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 "muu rööbastee"
 
 #. color otherrail
-#: build/trans_style.java:1192
+#: build/trans_style.java:1217
 msgid "railover"
 msgstr "ülarelss"
@@ -29858,7 +30181,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 "kasutamata raudtee"
@@ -29904,6 +30227,6 @@
 #. <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 "aeronautika"
@@ -29917,5 +30240,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1327
+#: build/trans_style.java:1352
 msgid "terminal"
 msgstr "lennuterminal"
@@ -29937,5 +30260,5 @@
 #. <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 "helikopterid"
@@ -29949,5 +30272,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1359
+#: build/trans_style.java:1384
 msgid "aeroway_light"
 msgstr "kerglennukid"
@@ -30017,7 +30340,7 @@
 #. <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 "trosstransport"
@@ -30034,5 +30357,5 @@
 #. <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 "suusanõlv lihtne"
@@ -30047,5 +30370,5 @@
 #. <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 "suusanõlv keskmine"
@@ -30060,5 +30383,5 @@
 #. <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 "suusanõlv edasijõudnutele"
@@ -30073,5 +30396,5 @@
 #. <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 ""
@@ -30086,5 +30409,5 @@
 #. <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 "suusanõlv klassita"
@@ -30099,5 +30422,5 @@
 #. <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 "suusanõlv algajale"
@@ -30217,11 +30540,11 @@
 #. <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 "elektrivarustus"
@@ -30235,5 +30558,5 @@
 #. <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 "kai"
@@ -30247,5 +30570,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1643
+#: build/trans_style.java:1668
 msgid "pipeline"
 msgstr "torujuhe"
@@ -30389,13 +30712,13 @@
 #. <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 "puhkealad"
@@ -30409,5 +30732,5 @@
 #. <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 "paadisadam"
@@ -30503,10 +30826,10 @@
 #. <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 "mugavused"
@@ -30608,10 +30931,10 @@
 #. <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 "autohooldus"
@@ -31000,4 +31323,12 @@
 #.
 #. <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"/>
 #. color amenity_light
@@ -31041,23 +31372,24 @@
 #. <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 "muud teenused"
@@ -31089,6 +31421,6 @@
 #. <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 "vesi"
@@ -31149,8 +31481,8 @@
 #. <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 "tervishoid"
@@ -31503,26 +31835,26 @@
 #. <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 "pood"
@@ -31594,8 +31926,8 @@
 #. <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 "hotell"
@@ -31696,9 +32028,9 @@
 #. <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 "turism"
@@ -31786,9 +32118,9 @@
 #. <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 "alalooline"
@@ -31801,5 +32133,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3196
+#: build/trans_style.java:3229
 msgid "quarry"
 msgstr "kivimurd"
@@ -31813,5 +32145,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3204
+#: build/trans_style.java:3237
 msgid "landfill"
 msgstr "prügimägi"
@@ -31833,5 +32165,5 @@
 #. <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 "tehisjärv"
@@ -31845,5 +32177,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3260
+#: build/trans_style.java:3293
 msgid "farmyard"
 msgstr "taluõu"
@@ -31866,5 +32198,5 @@
 #. <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 "kaubandus"
@@ -31878,5 +32210,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3285
+#: build/trans_style.java:3318
 msgid "industrial"
 msgstr "tööstus"
@@ -31890,5 +32222,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3326
 msgid "brownfield"
 msgstr "jäätmaa"
@@ -31902,5 +32234,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3334
 msgid "greenfield"
 msgstr "rohepiirkond"
@@ -31914,5 +32246,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3309
+#: build/trans_style.java:3342
 msgid "railland"
 msgstr "raudteede piirkond"
@@ -31969,7 +32301,7 @@
 #. <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 "militaarala"
@@ -31983,5 +32315,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3367
 msgid "cemetery"
 msgstr "kalmistu"
@@ -31994,5 +32326,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3410
+#: build/trans_style.java:3443
 msgid "peak"
 msgstr "mäetipp"
@@ -32007,5 +32339,5 @@
 #. <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 "liustik"
@@ -32019,5 +32351,5 @@
 #. <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 "vulkaan"
@@ -32072,8 +32404,8 @@
 #. <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 "looduslik"
@@ -32087,5 +32419,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3485
 msgid "scrub"
 msgstr "põõsastik"
@@ -32099,5 +32431,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468
+#: build/trans_style.java:3501
 msgid "heath"
 msgstr "nõmm"
@@ -32111,5 +32443,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3476
+#: build/trans_style.java:3509
 msgid "woodarea"
 msgstr ""
@@ -32123,5 +32455,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3508
+#: build/trans_style.java:3541
 msgid "mud"
 msgstr "muda"
@@ -32135,5 +32467,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3516
+#: build/trans_style.java:3549
 msgid "beach"
 msgstr "rand"
@@ -32283,11 +32615,11 @@
 #. <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 "koht"
@@ -32301,5 +32633,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4239
+#: build/trans_style.java:4272
 msgid "tiger_data"
 msgstr ""
@@ -33053,5 +33385,2 @@
 #~ "See võib põhjustada sõlmede tahtmatud kustutamist.\n"
 #~ "Kas oled tõesti kindel, et soovid jätkata?"
-
-#~ msgid "Are you sure?"
-#~ msgstr "Kas oled kindel?"
Index: /applications/editors/josm/i18n/po/fi.po
===================================================================
--- /applications/editors/josm/i18n/po/fi.po	(revision 21970)
+++ /applications/editors/josm/i18n/po/fi.po	(revision 21971)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-15 18:25+0200\n"
-"PO-Revision-Date: 2010-06-09 22:22+0000\n"
-"Last-Translator: Kalle Lampila <Unknown>\n"
+"POT-Creation-Date: 2010-06-23 22:47+0200\n"
+"PO-Revision-Date: 2010-06-15 17:15+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-06-15 16:22+0000\n"
+"X-Launchpad-Export-Date: 2010-06-23 20:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -23,5 +23,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
@@ -93,5 +93,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
@@ -252,5 +252,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
@@ -273,5 +273,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
@@ -279,6 +279,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
@@ -287,4 +289,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
@@ -409,4 +413,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
@@ -446,5 +451,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 "Tiedot"
@@ -656,5 +661,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
@@ -669,5 +674,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 "Poista"
@@ -916,4 +921,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 ""
@@ -924,4 +930,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 "Tämä voi johtaa pisteiden poistamiseen vahingossa."
@@ -1497,6 +1504,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
@@ -1523,4 +1530,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
@@ -1529,6 +1538,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 "Virhe"
@@ -1678,8 +1687,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 "Kyllä, poista pisteet"
 
 #: ../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 "Poista pisteet ladatun alueen ulkopuolelta"
@@ -1688,5 +1699,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 "Ei, peruuta"
@@ -1694,16 +1706,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 "Peruuta toiminto"
 
 #: ../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 "Haluatko poistaa ne silti?"
 
 #: ../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 "Poista pisteitä ladatun alueen ulkopuolelta?"
 
 #: ../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 "Valitse vähintään yksi polku jonka haluat yksinkertaistaa."
@@ -1712,13 +1729,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 "Kyllä"
 
 #: ../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 "Yksinkertaista kaikki valitut polut"
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:126
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:89
 #, java-format
 msgid ""
@@ -1727,8 +1747,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 "Yksinkertaista polut?"
 
 #: ../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"
@@ -1738,4 +1760,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)"
@@ -2028,5 +2051,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 "Ei lähetettäviä muutoksia."
@@ -2044,14 +2066,14 @@
 msgstr "Lähetä kaikkien valittujen kohteiden muutokset OSM-palvelimelle"
 
-#: ../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 "Tarkistetaan poistettujen kohteiden emokohteita"
 
-#: ../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 "Luetaan kohteen ''{0}'' emokohteita"
 
-#: ../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 "Etsitään poistettuja emokohteita paikallisesta datajoukosta"
@@ -2307,5 +2329,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
@@ -2973,10 +2995,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
@@ -3102,5 +3128,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
@@ -3227,11 +3253,11 @@
 msgstr[1] "Siirrä {0} pistettä"
 
-#: ../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"
@@ -3240,5 +3266,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 #, java-format
 msgid ""
@@ -3247,5 +3273,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}"
@@ -3598,4 +3624,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}"
@@ -3607,29 +3636,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 "Relaatio id = {0} puuttuu kohdejoukosta"
 
-#: ../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 ""
 
@@ -3709,19 +3732,19 @@
 "</p><p>Saat kaikki kohteet näkyviin sulkemalla suodinpaneelin.<p></html>"
 
-#: ../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 "Objekti, jonka tunniste on 0, ei voi olla näkymätön"
 
-#: ../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 ""
@@ -3732,5 +3755,5 @@
 "oli {0}."
 
-#: ../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 "
@@ -3739,5 +3762,5 @@
 "Objekteja ei voi yhdistää, koska jompikumpi niistä on uusi, mutta toinen ei"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1169
 #, java-format
 msgid ""
@@ -3809,5 +3832,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 "valitut"
@@ -4094,5 +4117,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 "rakennus"
@@ -4179,5 +4202,5 @@
 msgstr "Objekti poistettu"
 
-#: ../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
@@ -4399,5 +4422,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
@@ -4406,4 +4429,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
@@ -4609,5 +4633,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
@@ -5266,10 +5290,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"
@@ -5278,10 +5304,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
@@ -5363,4 +5391,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 "ei mitään"
@@ -5662,5 +5691,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
@@ -5758,5 +5787,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
@@ -5764,5 +5793,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 "Lisää"
@@ -5811,5 +5840,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 "Historia"
@@ -6029,10 +6058,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 "Valitse relaatioluettelosta"
 
 #: ../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 "Valitse relaatio relaatioluettelosta"
@@ -7636,9 +7665,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 "Lisää ominaisuuksia"
 
-#: ../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."
@@ -7647,23 +7676,23 @@
 msgstr[1] "Olet muuttamassa {0} kohdetta."
 
-#: ../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 "Tyhjä arvo poistaa avaimen."
 
-#: ../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 "<eri>"
 
-#: ../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 "Muutetaanko arvot?"
 
-#: ../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"
@@ -7672,5 +7701,5 @@
 msgstr[1] ""
 
-#: ../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."
@@ -7679,77 +7708,77 @@
 msgstr[1] "Olet muuttamassa {0} kohdetta."
 
-#: ../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 "Valitse avain"
 
-#: ../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 "Valitse arvo"
 
-#: ../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 "Valitse kohteet, joiden ominaisuuksia haluat muokata."
 
-#: ../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 "Ominaisuudet/jäsenyydet"
 
-#: ../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 "Valittujen objektien ominaisuudet."
 
 #. 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 "Jäsenyydet"
 
-#: ../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 "Ominaisuudet: {0} / Jäsenyydet: {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 "Ominaisuudet / Jäsenyydet"
 
-#: ../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 "Muuta relaatiota"
 
-#: ../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 "Poista relaatiosta"
 
-#: ../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 "Poistetaanko valinta relaatiosta {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 "Poista valittu avain kaikista objekteista"
 
-#: ../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 "Poista asetukset"
 
-#: ../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 "Lisää uusi arvo/avain-pari kaikkiin objekteihin"
 
-#: ../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 "Muokkaa valitun avaimen arvoa kaikissa objekteissa"
 
-#: ../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 "Valitse relaatio"
 
-#: ../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 "Valitse relaatio päävalinnasta"
@@ -9109,5 +9138,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 ""
@@ -9612,5 +9641,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..."
@@ -11303,5 +11332,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 "Ole hyvä ja valitse poistettava rivi."
@@ -11791,5 +11820,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 "Käytä sisäänrakennettuja oletusarvoja"
@@ -12255,5 +12284,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 ""
@@ -12263,10 +12292,10 @@
 
 #. 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 ""
@@ -12276,5 +12305,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
 #, java-format
 msgid ""
@@ -12283,5 +12312,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 ""
@@ -12290,5 +12319,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 ""
@@ -12297,9 +12326,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 "Tagien esivalinnat"
@@ -12752,4 +12781,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 "Muuta ominaisuuksia"
@@ -12935,5 +12965,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}''"
@@ -13219,10 +13249,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 ""
@@ -13231,69 +13261,69 @@
 "Objektin \"{0}\" uuden version muoto poikkeaa odotetusta. Saatiin \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
 msgid "Creating changeset..."
 msgstr "Muutoskokoelmaa luodaan..."
 
-#: ../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 "Muutoskokoelma {0} avattiin onnistuneesti"
 
-#: ../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 "Muutoskokoelmaa päivitetään..."
 
-#: ../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 "Muutoskokoelmaa {0} päivitetään..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:388
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389
 msgid "Closing changeset..."
 msgstr "Muutoskokoelmaa suljetaan..."
 
-#: ../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 "Valmistellaan lähetystä..."
 
-#: ../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}."
@@ -13473,4 +13503,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})"
@@ -15160,9 +15191,29 @@
 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 "Rakennukset"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#, fuzzy
+msgid "Rotate crosshair"
+msgstr "Käännä oikealle"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#, fuzzy
+msgid "Advanced settings"
+msgstr "Muuta lisäasetuksia"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#, fuzzy
+msgid "Building tag:"
+msgstr "Rakennus"
+
+#: ../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"
@@ -15171,35 +15222,45 @@
 #: ../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 "Julkinen rakennus"
+
+#: ../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
+#, fuzzy
+msgid "Advanced..."
+msgstr "Lisäasetukset"
+
+#: ../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 ""
 
@@ -15420,8 +15481,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 "vesi"
@@ -15482,6 +15543,6 @@
 #. <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 "osoite"
@@ -15939,6 +16000,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 "Tyhjä taso"
@@ -16121,4 +16182,52 @@
 msgstr "GPX-tasoa ei löytynyt."
 
+#: ../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 "Muokkaa eläintarhan ominaisuuksia"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#, fuzzy
+msgid "Name:"
+msgstr "Nimi"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#, fuzzy
+msgid "CmdLine:"
+msgstr "Koordinaatit:"
+
+#: ../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
+#, fuzzy, java-format
+msgid "Delete tool \"{0}\"?"
+msgstr "Poista piste {0}"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:74
+msgid "Are you sure?"
+msgstr "Oletko varma?"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
+#, fuzzy
+msgid "New tool..."
+msgstr "Uusi rooli"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
+#, fuzzy
+msgid "Install"
+msgstr "Teollisuusalue"
+
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
 msgid "Position only"
@@ -17364,5 +17473,5 @@
 msgstr "Palauta"
 
-#: ../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}"
@@ -17413,4 +17522,43 @@
 msgid "Revert changeset #{0}"
 msgstr ""
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:78
+#, fuzzy
+msgid "Road Sign Plugin"
+msgstr "Ladataan liitännäisiä"
+
+#: ../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 "Tagien esiasetuslähdettä ei voitu lukea: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
+#, fuzzy, java-format
+msgid "Error parsing tagging preset from ''{0}'':\n"
+msgstr ""
+"Virhe valmisteltaessa testiä {0}:\n"
+" {1}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:104
+#, fuzzy, java-format
+msgid "Sign {0}"
+msgstr "Valinta: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:111
+#, fuzzy, java-format
+msgid "Additional sign {0}"
+msgstr "Lisää relaatio {0}"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -17517,4 +17665,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 "Yksinkertaista polku"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
+#, fuzzy
+msgid "Delete unnecessary nodes from an area."
+msgstr "Poistaa turhat pisteet polusta."
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
 msgid "Slippy Map"
@@ -19431,5 +19590,5 @@
 #. <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 "alue"
@@ -19527,11 +19686,147 @@
 msgstr "{0}, ..."
 
-#: ../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
+#, fuzzy, java-format
+msgid "{0} {1}% of GPS track"
+msgstr "{0}:ssä on {1} jälki"
+
+#: ../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 "Tuo äänitiedosto"
+
+#: ../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 "Poista"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
+#, fuzzy
+msgid "removes current video from layer"
+msgstr "Poista kuva tasosta"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
+#, fuzzy
+msgid "play/pause"
+msgstr "Toista/tauko"
+
+#: ../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 "tausta"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
+#, fuzzy
+msgid "jumps n sec back"
+msgstr "Siirry takaisin"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "forward"
+msgstr "Eteenpäin"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "jumps n sec forward"
+msgstr "Siirry eteenpäin"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
+#, fuzzy
+msgid "faster"
+msgstr "Nopeammin"
+
+#: ../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 "Hitaammin"
+
+#: ../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 "Keskitä LiveGPS-taso jatkuvasti nykyiseen sijaintiin."
+
+#. 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
+#, fuzzy
+msgid "Jump length"
+msgstr "Siirry"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#, fuzzy
+msgid "Set the length of a jump"
+msgstr "Aseta kieli"
+
+#: ../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
+#, fuzzy
+msgid "Loop length"
+msgstr "Pituus: "
+
+#: ../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 "tasoon"
+
+#: ../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 ""
 
@@ -19744,28 +20039,28 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
 msgid "Automatic downloading"
 msgstr "Automaattinen lataus"
 
-#: ../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 ""
@@ -19776,17 +20071,17 @@
 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 ""
 
-#: ../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"
@@ -19795,96 +20090,96 @@
 "resoluutiota"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329
 msgid "Change resolution"
 msgstr "Vaihda resoluutiota"
 
-#: ../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 "Tallenna WMS-taso tiedostoon"
 
-#: ../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 "Lataa WMS-taso tiedostosta"
 
-#: ../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 ""
 
-#: ../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 "Virhe ladattaessa tiedostoa"
 
-#: ../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 "Luo tyhjä WMS-taso, johon voit avata kuvatiedoston."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
 msgid "WMS Plugin Preferences"
 msgstr "WMS-liitännäisen asetukset"
 
-#: ../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 "Voit muokata käytettävissä olevien WMS-palvelinten listaa"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -19900,4 +20195,8 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
 msgid "% of north:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186
+msgid "Simultaneous connections"
 msgstr ""
 
@@ -19963,5 +20262,5 @@
 #. <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 "talousmetsä"
@@ -20056,12 +20355,12 @@
 #. <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 "raja"
@@ -20145,9 +20444,9 @@
 #. <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 "reitti"
@@ -20424,20 +20723,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:24
+#: 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 "
@@ -20447,10 +20746,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."
@@ -20458,5 +20757,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 "
@@ -20466,15 +20765,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 "
@@ -20483,5 +20782,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 "
@@ -20491,15 +20790,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"
@@ -20507,5 +20806,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."
@@ -20513,5 +20812,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 "
@@ -20520,5 +20819,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 "
@@ -20527,10 +20826,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."
@@ -20538,15 +20837,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 "
@@ -20555,10 +20855,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 "
@@ -20567,15 +20874,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 "
@@ -20585,10 +20892,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). "
@@ -20597,5 +20904,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) "
@@ -20604,5 +20911,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:89
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20611,10 +20918,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 "
@@ -20623,5 +20930,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 "
@@ -20631,5 +20938,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:97
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20638,15 +20945,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 "
@@ -20655,5 +20962,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:105
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21548,5 +21855,5 @@
 #. <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 "kiertoliittymä"
@@ -22009,5 +22316,5 @@
 #. <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 "asuinkatu"
@@ -22042,5 +22349,5 @@
 #. <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 ""
@@ -22074,6 +22381,6 @@
 #. <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 ""
@@ -23083,5 +23390,5 @@
 #. <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 "suo"
@@ -23474,9 +23781,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 ""
@@ -25647,28 +25954,28 @@
 #: 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 "urheilu"
@@ -27415,9 +27722,9 @@
 #. <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 ""
@@ -28856,8 +29163,16 @@
 #. </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>
@@ -28869,4 +29184,13 @@
 #. <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 -->
@@ -28914,7 +29238,8 @@
 #: 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 "polkupyörä"
@@ -28974,4 +29299,12 @@
 #. <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>
@@ -28992,6 +29325,7 @@
 #: 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 ""
@@ -29013,5 +29347,5 @@
 #. <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 "metro"
@@ -29307,5 +29641,5 @@
 #: 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 ""
@@ -29688,7 +30022,7 @@
 #. <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 ""
@@ -29780,5 +30114,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:842
+#: build/trans_style.java:867
 msgid "services"
 msgstr ""
@@ -29792,5 +30126,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:850
+#: build/trans_style.java:875
 msgid "ford"
 msgstr ""
@@ -29811,5 +30145,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:865
+#: build/trans_style.java:890
 msgid "turningcircle"
 msgstr "kääntöympyrä"
@@ -29824,5 +30158,5 @@
 #. <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 ""
@@ -29837,5 +30171,5 @@
 #. <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 ""
@@ -29849,5 +30183,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:1018
+#: build/trans_style.java:1043
 msgid "stream"
 msgstr ""
@@ -29861,5 +30195,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1041
+#: build/trans_style.java:1066
 msgid "dock"
 msgstr ""
@@ -30056,14 +30390,14 @@
 #. <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 ""
@@ -30077,5 +30411,5 @@
 #. <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 ""
@@ -30137,7 +30471,7 @@
 #. <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 ""
@@ -30160,10 +30494,10 @@
 #. <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 ""
@@ -30199,7 +30533,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 ""
@@ -30245,6 +30579,6 @@
 #. <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 ""
@@ -30258,5 +30592,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1327
+#: build/trans_style.java:1352
 msgid "terminal"
 msgstr "terminaali"
@@ -30278,5 +30612,5 @@
 #. <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 ""
@@ -30290,5 +30624,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1359
+#: build/trans_style.java:1384
 msgid "aeroway_light"
 msgstr ""
@@ -30358,7 +30692,7 @@
 #. <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 "köysirata"
@@ -30375,5 +30709,5 @@
 #. <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 ""
@@ -30388,5 +30722,5 @@
 #. <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 ""
@@ -30401,5 +30735,5 @@
 #. <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 ""
@@ -30414,5 +30748,5 @@
 #. <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 ""
@@ -30427,5 +30761,5 @@
 #. <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 ""
@@ -30440,5 +30774,5 @@
 #. <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 ""
@@ -30558,11 +30892,11 @@
 #. <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 ""
@@ -30576,5 +30910,5 @@
 #. <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 "laituri"
@@ -30588,5 +30922,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1643
+#: build/trans_style.java:1668
 msgid "pipeline"
 msgstr ""
@@ -30730,13 +31064,13 @@
 #. <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 ""
@@ -30750,5 +31084,5 @@
 #. <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 ""
@@ -30844,10 +31178,10 @@
 #. <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 ""
@@ -30949,10 +31283,10 @@
 #. <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 ""
@@ -31341,4 +31675,12 @@
 #.
 #. <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"/>
 #. color amenity_light
@@ -31382,23 +31724,24 @@
 #. <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 ""
@@ -31430,6 +31773,6 @@
 #. <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 ""
@@ -31490,8 +31833,8 @@
 #. <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 ""
@@ -31844,26 +32187,26 @@
 #. <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 "kauppa"
@@ -31935,8 +32278,8 @@
 #. <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 "hotelli"
@@ -32037,9 +32380,9 @@
 #. <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 "turismi"
@@ -32127,9 +32470,9 @@
 #. <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 "historiallinen"
@@ -32142,5 +32485,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3196
+#: build/trans_style.java:3229
 msgid "quarry"
 msgstr "louhos"
@@ -32154,5 +32497,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3204
+#: build/trans_style.java:3237
 msgid "landfill"
 msgstr "kaatopaikka"
@@ -32174,5 +32517,5 @@
 #. <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 "valuma-alue"
@@ -32186,5 +32529,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3260
+#: build/trans_style.java:3293
 msgid "farmyard"
 msgstr ""
@@ -32207,5 +32550,5 @@
 #. <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 "kaupallinen"
@@ -32219,5 +32562,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3285
+#: build/trans_style.java:3318
 msgid "industrial"
 msgstr "teollisuus"
@@ -32231,5 +32574,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3326
 msgid "brownfield"
 msgstr ""
@@ -32243,5 +32586,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3334
 msgid "greenfield"
 msgstr ""
@@ -32255,5 +32598,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3309
+#: build/trans_style.java:3342
 msgid "railland"
 msgstr "rata-alue"
@@ -32310,7 +32653,7 @@
 #. <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 "armeija"
@@ -32324,5 +32667,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3367
 msgid "cemetery"
 msgstr "hautausmaa"
@@ -32335,5 +32678,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3410
+#: build/trans_style.java:3443
 msgid "peak"
 msgstr "huippu"
@@ -32348,5 +32691,5 @@
 #. <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 "jäätikkö"
@@ -32360,5 +32703,5 @@
 #. <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 "tulivuori"
@@ -32413,8 +32756,8 @@
 #. <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 ""
@@ -32428,5 +32771,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3485
 msgid "scrub"
 msgstr "pusikko"
@@ -32440,5 +32783,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468
+#: build/trans_style.java:3501
 msgid "heath"
 msgstr "nummi"
@@ -32452,5 +32795,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3476
+#: build/trans_style.java:3509
 msgid "woodarea"
 msgstr ""
@@ -32464,5 +32807,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3508
+#: build/trans_style.java:3541
 msgid "mud"
 msgstr "muta"
@@ -32476,5 +32819,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3516
+#: build/trans_style.java:3549
 msgid "beach"
 msgstr "ranta"
@@ -32624,11 +32967,11 @@
 #. <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 ""
@@ -32642,5 +32985,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4239
+#: build/trans_style.java:4272
 msgid "tiger_data"
 msgstr ""
@@ -33147,7 +33490,4 @@
 #~ msgid "zoom"
 #~ msgstr "zoom"
-
-#~ msgid "Are you sure?"
-#~ msgstr "Oletko varma?"
 
 #~ msgid "All images"
Index: /applications/editors/josm/i18n/po/fr.po
===================================================================
--- /applications/editors/josm/i18n/po/fr.po	(revision 21970)
+++ /applications/editors/josm/i18n/po/fr.po	(revision 21971)
@@ -6,7 +6,7 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-15 17:35+0200\n"
-"PO-Revision-Date: 2010-06-15 15:09+0000\n"
-"Last-Translator: Luc Alquier <Unknown>\n"
+"POT-Creation-Date: 2010-06-23 22:47+0200\n"
+"PO-Revision-Date: 2010-06-23 13:48+0000\n"
+"Last-Translator: Emilien Klein <emilien+ubuntu@klein.st>\n"
 "Language-Team: Fr <>\n"
 "MIME-Version: 1.0\n"
@@ -14,5 +14,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2010-06-15 16:22+0000\n"
+"X-Launchpad-Export-Date: 2010-06-23 20:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Language: French\n"
@@ -22,5 +22,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
@@ -35,5 +35,5 @@
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
-msgstr "L’URL de fichier est invalide, elle est ignorée : \"{0}\""
+msgstr "L’URL du fichier est invalide, elle est ignorée : \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:438
@@ -92,5 +92,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
@@ -197,6 +197,6 @@
 msgstr ""
 "Attention : le format URL de l’API est inattendue. La redirection vers la "
-"page OSM info ou historique de la primitive échouera probablement. L’URL est "
-": ''{0}''"
+"page OSM info ou historique de la primitive échouera probablement. L’URL "
+"est : ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63
@@ -253,5 +253,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
@@ -274,5 +274,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
@@ -280,6 +280,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
@@ -288,4 +290,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
@@ -324,9 +328,9 @@
 #, java-format
 msgid ""
-"<html>There are no layers the source layer<br>''{0}''<br>could be merged "
-"to.</html>"
-msgstr ""
-"<html>Il n’y a pas de calque avec lequel le calque "
-"source<br>\"{0}\"<br>puisse être fusionné.</html>"
+"<html>There are no layers the source layer<br>''{0}''<br>could be merged to."
+"</html>"
+msgstr ""
+"<html>Il n’y a pas de calque avec lequel le calque source<br>\"{0}"
+"\"<br>puisse être fusionné.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:81
@@ -349,9 +353,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
@@ -411,4 +415,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
@@ -448,5 +453,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 "Information"
@@ -660,5 +665,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
@@ -673,5 +678,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 "Supprimer"
@@ -704,6 +709,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 msgid "Distribute the selected nodes to equal distances along a line."
-msgstr ""
-"Répartir les nœuds sélectionnés à égale distance le long d’une ligne."
+msgstr "Répartir les nœuds sélectionnés à égale distance le long d’une ligne."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
@@ -745,6 +749,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:48
 msgid "Select if the referrers of the object should be downloaded as well"
-msgstr ""
-"Choisir si les référants de l'objet doivent être également téléchargés"
+msgstr "Choisir si les référants de l'objet doivent être également téléchargés"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56
@@ -923,4 +926,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 ""
@@ -933,4 +937,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 "Cela peut conduire à la suppression accidentelle de nœuds."
@@ -1358,7 +1363,7 @@
 msgstr ""
 "<html>Vous utilisez la projection EPSG:4326 qui pourrait conduire<br>à "
-"d’indésirables résultats en faisant des alignements "
-"rectangulaires.<br>Changez votre projection pour supprimer cet "
-"avertissement.<br>Voulez-vous continuer ?</html>"
+"d’indésirables résultats en faisant des alignements rectangulaires."
+"<br>Changez votre projection pour supprimer cet avertissement.<br>Voulez-"
+"vous continuer ?</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:148
@@ -1515,6 +1520,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
@@ -1541,4 +1546,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
@@ -1547,6 +1554,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 "Erreur"
@@ -1662,6 +1669,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 ""
 "Afficher le rapport d’état avec les informations utiles pouvant être "
@@ -1699,8 +1705,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 "Oui, supprimer les nœuds"
 
 #: ../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 "Supprimer les nœuds situés hors des zones de données téléchargées"
@@ -1709,5 +1717,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 "Non, annuler"
@@ -1715,16 +1724,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 "Annuler l'opération"
 
 #: ../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 "Voulez-vous les supprimer tout de même ?"
 
 #: ../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 "Supprimer les nœuds situés en dehors des zones de données ?"
 
 #: ../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 "Veuillez sélectionner au moins un chemin à simplifier."
@@ -1733,13 +1747,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 "Oui"
 
 #: ../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 "SImplifier tous les chemins sélectionnés"
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:126
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:89
 #, java-format
 msgid ""
@@ -1748,8 +1765,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 "Simplifier les chemins ?"
 
 #: ../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"
@@ -1759,4 +1778,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)"
@@ -1806,6 +1826,5 @@
 msgid_plural "The selected way does not contain all the selected nodes."
 msgstr[0] "Le chemin sélectionné ne contient pas le nœud sélectionné."
-msgstr[1] ""
-"Le chemin sélectionné ne contient pas tous les nœuds sélectionnés."
+msgstr[1] "Le chemin sélectionné ne contient pas tous les nœuds sélectionnés."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:266
@@ -1897,6 +1916,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 "* Un nœud utilisé par plus d’un chemin et un de ces chemins, ou"
 
@@ -1968,9 +1986,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)"
@@ -1987,5 +2005,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
@@ -2053,5 +2071,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 "Aucune modification à envoyer."
@@ -2069,14 +2086,14 @@
 msgstr "Envoyer toutes les modifications de la sélection vers le serveur OSM"
 
-#: ../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 "Vérification des parents pour objets supprimés."
 
-#: ../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 "Lecture des parents de \"{0}\""
 
-#: ../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 "Vérification des parents supprimés dans le jeu de données local"
@@ -2345,5 +2362,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
@@ -2467,6 +2484,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 ""
 "Déplacer la tête de lecture et la relâcher à côté de la trace audio à lire ; "
@@ -2607,5 +2624,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."
@@ -2735,6 +2752,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 ""
 "<b>nœuds :</b>... - objet avec un nombre donné de nœuds (nœuds : nombre ou "
@@ -3032,10 +3049,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
@@ -3138,6 +3159,6 @@
 "conflict cannot be added.</html>"
 msgstr ""
-"<html>Le calque \"{0}\" a déjà un conflit pour la primitive "
-"<br>\"{1}\"</br>. Ce conflit ne peut pas être ajouté.</html>"
+"<html>Le calque \"{0}\" a déjà un conflit pour la primitive <br>\"{1}\"</"
+"br>. Ce conflit ne peut pas être ajouté.</html>"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36
@@ -3161,5 +3182,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
@@ -3241,7 +3262,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 ""
 "Vous êtes sur le point de supprimer des nœuds en dehors de la zone "
@@ -3293,11 +3314,11 @@
 msgstr[1] "Déplacer {0} nœuds"
 
-#: ../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 "Objet purgé ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111
 #, java-format
 msgid "Purged {0} object"
@@ -3306,5 +3327,5 @@
 msgstr[1] "{0} objets enlevés"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 #, java-format
 msgid ""
@@ -3315,5 +3336,5 @@
 "inférieur à 2. Actuellement il est de {1}"
 
-#: ../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}"
@@ -3535,6 +3556,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 ""
 "<html>Le fichier des préférences contient des erreurs.<br>Création d’une "
@@ -3634,5 +3655,5 @@
 #. *
 #. * the decimal format 999.999
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3641,5 +3662,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3648,5 +3669,5 @@
 #. *
 #. * coordinates East/North
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3699,4 +3720,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}"
@@ -3708,33 +3732,24 @@
 msgstr "Cible de fusion manquante pour l’objet avec l’identifiant {0}"
 
-#: ../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 "Cible de fusion manquante pour le nœud avec l’identifiant {0}"
 
-#: ../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 "Cible de fusion manquante pour la relation avec l’identifiant {0}"
 
-#: ../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 "Cible de fusion manquante pour le type {0} avec l’identifiant {1}"
-
-#. 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 ""
-"L’objet cible avec l’identifiant {0} et la version {1} est visible alors que "
-"l’objet source avec la version {2} n’est pas visible. Impossible de gérer "
-"cette incohérence. L’objet cible est gardé. "
 
 #. translators notes must be in front
@@ -3811,22 +3826,22 @@
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
-"</p><p>Fermer la fenêtre de dialogue du filtre pour voir tous les "
-"objets.<p></html>"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:498
+"</p><p>Fermer la fenêtre de dialogue du filtre pour voir tous les objets."
+"<p></html>"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:506
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "Une primitive avec un ID égal à 0 ne peut pas être invisible."
 
-#: ../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 "Un identifiant positif est attendu. Actuellement il est {0}."
 
-#: ../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 "Un numéro de version positif est attendu. Actuellement il est {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:795
 #, java-format
 msgid ""
@@ -3838,5 +3853,5 @@
 "est {0}"
 
-#: ../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 "
@@ -3846,5 +3861,5 @@
 "l'autre ne l'est pas"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1169
 #, java-format
 msgid ""
@@ -3904,6 +3919,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 ""
 "Impossible de comparer la primitive avec l’identifiant ''{0}'' à la "
@@ -3921,5 +3935,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 "sélectionné"
@@ -4085,9 +4099,8 @@
 #: ../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>"
-msgstr ""
-"<html>Impossible de lire les marque-pages depuis<br>''{0}''<br>Erreur : "
-"{1}</html>"
+msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+"<html>Impossible de lire les marque-pages depuis<br>''{0}''<br>Erreur : {1}</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
@@ -4157,5 +4170,5 @@
 #. color tiger_data
 #. </rule>
-#. 
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4165,5 +4178,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4172,5 +4185,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4179,5 +4192,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4186,5 +4199,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4193,5 +4206,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4200,9 +4213,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--annotation tags -->
-#. 
+#.
 #. <!--"work in progress" tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="building"/>
@@ -4211,5 +4224,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 "bâtiment"
@@ -4296,5 +4309,5 @@
 msgstr "Objet supprimé"
 
-#: ../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
@@ -4534,5 +4547,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
@@ -4541,4 +4554,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
@@ -4708,6 +4722,6 @@
 msgstr ""
 "Copy text   \t\r\n"
-"<html>Veuillez confirmer le retrait de <strong>1 objet</strong> de "
-"<strong>{0} relations</strong>.</html>"
+"<html>Veuillez confirmer le retrait de <strong>1 objet</strong> de <strong>"
+"{0} relations</strong>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156
@@ -4748,5 +4762,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
@@ -4787,6 +4801,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 ""
 "<html>Sinon vous pouvez préciser <strong>l’adresse d’une tuile</strong> au "
@@ -4821,5 +4835,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"
@@ -4828,5 +4842,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"
@@ -4835,5 +4849,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"
@@ -5020,6 +5034,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:293
 msgid "List of elements in their dataset, i.e. the server dataset"
-msgstr ""
-"Liste des éléments de leur jeu de données, i.e. les données du serveur"
+msgstr "Liste des éléments de leur jeu de données, i.e. les données du serveur"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:425
@@ -5029,6 +5042,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:427
 msgid "Copy my selected nodes to the start of the merged node list"
-msgstr ""
-"Copier mes nœuds sélectionnés au début de la liste des nœuds fusionnés"
+msgstr "Copier mes nœuds sélectionnés au début de la liste des nœuds fusionnés"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:452
@@ -5065,6 +5077,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 ""
 "Copier leurs éléments sélectionnés à la fin de la liste des éléments "
@@ -5150,6 +5161,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their "
-"entries.</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 "<html>Cliquer <strong>{0}</strong> pour fusionner leurs éléments avec les "
@@ -5159,6 +5170,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their "
-"entries.</html>"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
+"html>"
 msgstr ""
 "<html>Clicquer <strong>{0}</strong> pour arrêter la fusion de leurs éléments "
@@ -5215,6 +5226,6 @@
 #, java-format
 msgid ""
-"<html>An error occurred while communicating with the server<br>Details: "
-"{0}</html>"
+"<html>An error occurred while communicating with the server<br>Details: {0}</"
+"html>"
 msgstr ""
 "<html>Une erreur est survenue lors de la communication avec le "
@@ -5244,9 +5255,9 @@
 "server.<br><br>Do you want to undelete these nodes too?"
 msgstr[0] ""
-"{0} nœud utilisé sur le chemin {1}<br>a été supprimé sur le "
-"serveur.<br>Voulez-vous récupérer ce nœud ?"
+"{0} nœud utilisé sur le chemin {1}<br>a été supprimé sur le serveur."
+"<br>Voulez-vous récupérer ce nœud ?"
 msgstr[1] ""
-"{0} nœuds utilisés sur le chemin {1}<br>ont été supprimé sur le "
-"serveur.<br>Voulez-vous récupérer ces nœuds ?"
+"{0} nœuds utilisés sur le chemin {1}<br>ont été supprimé sur le serveur."
+"<br>Voulez-vous récupérer ces nœuds ?"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525
@@ -5287,6 +5298,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99
 msgid "Properties in their dataset, i.e. the server dataset"
-msgstr ""
-"Propriétés de leur jeu de données, par exemple les données du serveur"
+msgstr "Propriétés de leur jeu de données, par exemple les données du serveur"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115
@@ -5398,6 +5408,6 @@
 "dataset.<br>Do you agree?</html>"
 msgstr ""
-"<html>JOSM doit supprimer votre primitive locale avec l’identifiant "
-"{0}<br>du jeu de données.<br>Êtes-vous d’accord ?</html>"
+"<html>JOSM doit supprimer votre primitive locale avec l’identifiant {0}"
+"<br>du jeu de données.<br>Êtes-vous d’accord ?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685
@@ -5449,10 +5459,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"
@@ -5461,10 +5473,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
@@ -5520,6 +5534,5 @@
 #, java-format
 msgid "Conflicts when merging nodes - target node is ''{0}''"
-msgstr ""
-"La fusion des nœuds crée des conflits -le nœud destination est \"{0}\""
+msgstr "La fusion des nœuds crée des conflits -le nœud destination est \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:282
@@ -5549,4 +5562,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 "rien"
@@ -5718,6 +5732,6 @@
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
 msgstr ""
-"Entrer une valeur d’attribut, par exemple <strong><tt>vérifier les "
-"membres</tt></strong></html>"
+"Entrer une valeur d’attribut, par exemple <strong><tt>vérifier les membres</"
+"tt></strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
@@ -5785,7 +5799,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 ""
 "<html>Cocher pour afficher uniquement le groupe de modification de la "
@@ -5813,6 +5827,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 ""
 "Télécharger les informations sur le groupe de modifications sélectionné "
@@ -5860,5 +5873,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
@@ -5934,17 +5947,16 @@
 #, 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>"
-msgstr ""
-"<html>Vous n’avez pas fini de fusionner les différences dans ce "
-"conflit.<br>Les résolutions du conflit ne seront pas appliquées tans que "
-"toutes les différences ne seront pas<br>résolues.<br>Cliquez sur "
-"<strong>{0}</strong> pour fermer.<strong> Les différences<br>résolues ne "
-"seront pas appliquées.</strong><br>Cliquez sur <strong>{1}</strong> pour "
-"revenir à la résolution des conflits.</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 ""
+"<html>Vous n’avez pas fini de fusionner les différences dans ce conflit."
+"<br>Les résolutions du conflit ne seront pas appliquées tans que toutes les "
+"différences ne seront pas<br>résolues.<br>Cliquez sur <strong>{0}</strong> "
+"pour fermer.<strong> Les différences<br>résolues ne seront pas appliquées.</"
+"strong><br>Cliquez sur <strong>{1}</strong> pour revenir à la résolution des "
+"conflits.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
@@ -5966,5 +5978,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
@@ -5972,5 +5984,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 "Ajouter"
@@ -6019,5 +6031,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 "Historique"
@@ -6237,10 +6249,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 "Sélectionner dans la liste des relations"
 
 #: ../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 "Sélectionnez une relation dans la liste des relations."
@@ -6492,6 +6504,5 @@
 #, java-format
 msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
-"({0}/{1}) Téléchargement du contenu du groupe de modifications {2}..."
+msgstr "({0}/{1}) Téléchargement du contenu du groupe de modifications {2}..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:176
@@ -6507,6 +6518,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:308
 msgid "Download the changeset content from the OSM server"
-msgstr ""
-"Télécharger le contenu du groupe de modification depuis le serveur OSM"
+msgstr "Télécharger le contenu du groupe de modification depuis le serveur OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:199
@@ -6576,6 +6586,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
 msgid "The content of this changeset is not downloaded yet."
-msgstr ""
-"Le contenu de ce groupe de modifications n’est pas encore téléchargé."
+msgstr "Le contenu de ce groupe de modifications n’est pas encore téléchargé."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
@@ -7746,10 +7755,9 @@
 #, 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>"
-msgstr ""
-"Veuillez entrer une date dans le format de  vos paramètres "
-"régionaux.<br>Exemple : {0}<br>Exemple : {1}<br>Exemple : {2}<br>Exemple : "
-"{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 ""
+"Veuillez entrer une date dans le format de  vos paramètres régionaux."
+"<br>Exemple : {0}<br>Exemple : {1}<br>Exemple : {2}<br>Exemple : {3}<br>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1127
@@ -7759,7 +7767,6 @@
 "{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
 msgstr ""
-"Veuillez entrer un horodatage dans le format de  vos paramètres "
-"régionaux.<br>Exemple : {0}<br>Exemple : {1}<br>Exemple : {2}<br>Exemple : "
-"{3}<br>"
+"Veuillez entrer un horodatage dans le format de  vos paramètres régionaux."
+"<br>Exemple : {0}<br>Exemple : {1}<br>Exemple : {2}<br>Exemple : {3}<br>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:108
@@ -7778,8 +7785,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 ""
 "<html>Veuillez choisir une des <strong>requêtes suivantes</strong>. "
@@ -7798,6 +7805,6 @@
 msgstr ""
 "<html>Télécharger mes groupes de modifications ouverts<br><em>Désactivé. "
-"Veuillez d’abord entrer votre nom d’utilisateur OSM dans les "
-"préférences.</em></html>"
+"Veuillez d’abord entrer votre nom d’utilisateur OSM dans les préférences.</"
+"em></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:157
@@ -7810,6 +7817,6 @@
 "currently no map view active.</em></html>"
 msgstr ""
-"<html>Télécharger les groupes de modifications de la "
-"carte.<br><em>Désactivé. Il n’y a pas de carte.</em></html>"
+"<html>Télécharger les groupes de modifications de la carte."
+"<br><em>Désactivé. Il n’y a pas de carte.</em></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:168
@@ -7913,12 +7920,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:174
 msgid "This changeset query URL is invalid"
-msgstr ""
-"Cette URL de requête pour le groupe de modifications n’est pas valide"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:160
+msgstr "Cette URL de requête pour le groupe de modifications n’est pas valide"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:164
 msgid "Add Properties"
 msgstr "Ajouter des propriétés"
 
-#: ../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."
@@ -7927,23 +7933,23 @@
 msgstr[1] "Cette action modifiera {0} objets."
 
-#: ../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 "Une valeur vide supprime l’attribut."
 
-#: ../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 "<différent>"
 
-#: ../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 "Modifier les valeurs ?"
 
-#: ../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"
@@ -7952,5 +7958,5 @@
 msgstr[1] "Modifier les propriétés de {0} objets"
 
-#: ../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."
@@ -7959,77 +7965,77 @@
 msgstr[1] "Cette action modifiera {0} objets."
 
-#: ../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 "Sélectionnez une clé"
 
-#: ../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 "Sélectionnez une valeur"
 
-#: ../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 "Sélectionnez les objets dont vous voulez modifier les propriétés."
 
-#: ../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 "Propriétés/Appartenances"
 
-#: ../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 "Afficher les propriétés de la sélection"
 
 #. 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 "Membre de"
 
-#: ../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 "Position"
 
-#: ../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 "Propriétés : {0} / Appartenances : {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 "Propriétés / Appartenances"
 
-#: ../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 "Modifier la relation"
 
-#: ../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 "Supprimer de la relation"
 
-#: ../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 "Voulez-vous vraiment supprimer la sélection de la relation {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 "Supprimer la clé sélectionnée"
 
-#: ../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 "Supprimer des propriétés"
 
-#: ../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 "Ajouter une nouvelle paire clé / valeur"
 
-#: ../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 "Modifier la valeur de la clé sélectionnée"
 
-#: ../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 "Sélectionner une relation"
 
-#: ../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 "Sélectionner une relation dans la sélection principale."
@@ -8113,6 +8119,5 @@
 msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
 msgstr[0] "Téléchargement d’{0} enfant incomplet de {1} relations parentes"
-msgstr[1] ""
-"Téléchargement de {0} enfants incomplets de {1} relations parentes"
+msgstr[1] "Téléchargement de {0} enfants incomplets de {1} relations parentes"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
@@ -8144,17 +8149,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294
 msgid "Enter a role and apply it to the selected relation members"
-msgstr ""
-"Entrer un rôle et l'appliquer aux membres sélectionnés de la relation"
+msgstr "Entrer un rôle et l'appliquer aux membres sélectionnés de la relation"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
-"relation itself.<br>This creates circular dependencies and is "
-"discouraged.<br>How do you want to proceed with circular dependencies?</html>"
+"relation itself.<br>This creates circular dependencies and is discouraged."
+"<br>How do you want to proceed with circular dependencies?</html>"
 msgstr ""
 "<html>Au moins un membre de cette relation se rapporte<br>à la relation en "
-"elle-même.<br>Cela crée des dépendances circulaires et est "
-"déconseillé.<br>Comment voulez-vous procéder avec des dépendances "
-"circulaires ?</html>"
+"elle-même.<br>Cela crée des dépendances circulaires et est déconseillé."
+"<br>Comment voulez-vous procéder avec des dépendances circulaires ?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
@@ -8171,6 +8174,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 ""
 "<html>Cette relation possède déjà un ou plusieurs membres se rapportant "
@@ -8344,11 +8347,9 @@
 #, java-format
 msgid ""
-"<html>Layer ''{0}'' already has a conflict for "
-"primitive<br>''{1}''.<br>Please resolve this conflict first, then try "
-"again.</html>"
-msgstr ""
-"<html>Le calque ''{0}'' a déjà un conflit pour la "
-"primitive<br>''{1}''.<br>Veuillez d’abord résoudre ce conflit puis "
-"réessayer.</html>"
+"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
+"<br>Please resolve this conflict first, then try again.</html>"
+msgstr ""
+"<html>Le calque ''{0}'' a déjà un conflit pour la primitive<br>''{1}''."
+"<br>Veuillez d’abord résoudre ce conflit puis réessayer.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
@@ -8697,11 +8698,10 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is "
-"enabled.<br>Please chose to either download OSM data, or GPX data, or "
-"both.</html>"
-msgstr ""
-"<html>Ni <strong>{0}</strong> ni <strong>{1}</strong> n’est "
-"coché.<br>Veuillez choisir le téléchargement des données OSM, des données "
-"GPX, ou des deux.</html>"
+"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
+"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
+msgstr ""
+"<html>Ni <strong>{0}</strong> ni <strong>{1}</strong> n’est coché."
+"<br>Veuillez choisir le téléchargement des données OSM, des données GPX, ou "
+"des deux.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
@@ -8842,11 +8842,11 @@
 "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 ""
 "<html><p class=\"warning-header\">Contenu d’aide pour sujet manquant</p><p "
 "class=\"warning-body\">Un contenu d’aide pour le sujet <strong>{0}</strong> "
-"n’est pas encore disponible ni dans votre langue ({1}) ni en "
-"anglais.<br>Merci d’améliorer le système d’aide de JOSM en remplissant les "
+"n’est pas encore disponible ni dans votre langue ({1}) ni en anglais."
+"<br>Merci d’améliorer le système d’aide de JOSM en remplissant les "
 "informations manquantes. Vous pouvez modifier l’<a href=\"{2}\">aide dans "
 "votre langue ({1})</a> et l’<a href=\"{3}\">aide en anglais</a>.</p></html>"
@@ -8857,6 +8857,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 ""
 "<html><p class=\"error-header\">Erreur lors de la récupération des "
@@ -8895,6 +8895,6 @@
 msgstr ""
 "<html>L’URL <tt>{0}</tt><br>est une URL externe. Les modifications ne sont "
-"possibles que pour les sujets d’aide<br>sur le serveur dédié "
-"<tt>{1}</tt>.</html>"
+"possibles que pour les sujets d’aide<br>sur le serveur dédié <tt>{1}</tt>.</"
+"html>"
 
 #. putValue(NAME, tr("Reload"));
@@ -8921,6 +8921,5 @@
 #, java-format
 msgid "Warning: bad location in HTML document. Exception was: {0}"
-msgstr ""
-"Attention : mauvais emplacement dans le document HTML. Exception : {0}"
+msgstr "Attention : mauvais emplacement dans le document HTML. Exception : {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569
@@ -9158,18 +9157,17 @@
 "version of one<br>of your nodes, ways, or relations.<br>The conflict is "
 "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click "
-"<strong>{4}</strong> to synchronize the conflicting primitive only.<br>Click "
-"<strong>{5}</strong> to synchronize the entire local dataset with the "
-"server.<br>Click <strong>{6}</strong> to abort and continue "
-"editing.<br></html>"
+"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
+"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
+"strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{6}</strong> to abort and continue editing.<br></html>"
 msgstr ""
 "<html>L’envoi <strong>a échoué</strong> car le serveur possède une version "
 "plus récente de l’un de vos nœuds, chemins ou relations.<br>Le conflit vient "
 "de <strong>{0}</strong>  avec l’identifiant <strong>{1}</strong>,<br>le "
-"serveur a la version {2}, votre version est {3}.<br>Cliquez sur "
-"<strong>{4}</strong> pour synchroniser uniquement la primitive en "
-"conflit.<br>Cliquez sur <strong>{5}</strong> pour synchroniser le jeu de "
-"données avec le serveur.<br>Cliquez sur <strong>{6}</strong>  pour annuler "
-"et continuer les modifications.<br></html>"
+"serveur a la version {2}, votre version est {3}.<br>Cliquez sur <strong>{4}</"
+"strong> pour synchroniser uniquement la primitive en conflit.<br>Cliquez sur "
+"<strong>{5}</strong> pour synchroniser le jeu de données avec le serveur."
+"<br>Cliquez sur <strong>{6}</strong>  pour annuler et continuer les "
+"modifications.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
@@ -9183,8 +9181,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 ""
 "<html>L’envoi <strong>a échoué</strong> car le serveur possède une version "
@@ -9231,7 +9228,7 @@
 "<html>L’envoi <strong>a échoué</strong> parce que vous essayez de supprimer "
 "le nœud {0} qui est toujours utilisé par le chemin {1}.<br>Cliquez sur "
-"<strong>{2}</strong> pour télécharger tous les chemins parents du nœud "
-"{0}.<br>JOSM identifiera les conflits que vous pourrez résoudre à partir de "
-"la fenêtre Résolution des conflits.</html>"
+"<strong>{2}</strong> pour télécharger tous les chemins parents du nœud {0}."
+"<br>JOSM identifiera les conflits que vous pourrez résoudre à partir de la "
+"fenêtre Résolution des conflits.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237
@@ -9295,6 +9292,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:100
 msgid "Upload data to an already existing and open changeset"
-msgstr ""
-"Envoyer les données vers un groupe de modifications existant et ouvert"
+msgstr "Envoyer les données vers un groupe de modifications existant et ouvert"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:111
@@ -9308,6 +9304,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:146
 msgid "Select to close the changeset after the next upload"
-msgstr ""
-"Cocher pour fermer le groupe de modifications après le prochain envoi"
+msgstr "Cocher pour fermer le groupe de modifications après le prochain envoi"
 
 #. putValue(NAME, tr("Reload"));
@@ -9469,5 +9464,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 "Non"
@@ -9475,6 +9470,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 ""
 "Le calque ''{0}'' a des modifications qui devraient être envoyées vers le "
@@ -9560,6 +9554,6 @@
 msgstr[1] ""
 "<html>Les calques {0} comportent des conflits non résolus.<br>Résolvez-les "
-"ou abandonnez les modifications.<br>Calques qui comportent des conflits "
-":</html>"
+"ou abandonnez les modifications.<br>Calques qui comportent des conflits :</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
@@ -9574,10 +9568,10 @@
 msgid_plural ""
 "<html>{0} layers need saving but have no associated file.<br>Either select a "
-"file for each of them or discard the changes.<br>Layers without a "
-"file:</html>"
+"file for each of them or discard the changes.<br>Layers without a file:</"
+"html>"
 msgstr[0] ""
-"<html>{0} calque doit être sauvegardé mais il n’a pas de fichier "
-"associé.<br>Sélectionner un fichier pour ce calque ou annuler les "
-"modifications.<br>Calque sans fichier :</html>"
+"<html>{0} calque doit être sauvegardé mais il n’a pas de fichier associé."
+"<br>Sélectionner un fichier pour ce calque ou annuler les modifications."
+"<br>Calque sans fichier :</html>"
 msgstr[1] ""
 "<html>{0} calques doivent être sauvegardés mais il n’a pas de fichier "
@@ -9593,6 +9587,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 "
@@ -9602,6 +9596,6 @@
 "<html>{0} calque doit être sauvegardé mais il a un fichier associé<br>qui "
 "n’est pas inscriptible.<br>Sélectionnez un autre fichier pour ce calque ou "
-"abandonnez les modifications.<br>Calque avec un fichier non-inscriptible "
-":</html>"
+"abandonnez les modifications.<br>Calque avec un fichier non-inscriptible :</"
+"html>"
 msgstr[1] ""
 "<html>{0} calques doivent être sauvegardés mais ils ont des fichiers "
@@ -9845,5 +9839,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9862,6 +9856,6 @@
 msgid "Objects are uploaded to a <strong>new changeset</strong>."
 msgstr ""
-"Les objets sont envoyés vers un <strong>nouveau groupe de "
-"modifications</strong>."
+"Les objets sont envoyés vers un <strong>nouveau groupe de modifications</"
+"strong>."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48
@@ -9871,12 +9865,10 @@
 "comment ''{1}''."
 msgstr ""
-"Les objets sont envoyés vers le <strong>groupe de modifications "
-"ouvert</strong> {0} avec le commentaire ''{1}''."
+"Les objets sont envoyés vers le <strong>groupe de modifications ouvert</"
+"strong> {0} avec le commentaire ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:55
-msgid ""
-"The changeset is going to be <strong>closed</strong> after this upload"
-msgstr ""
-"Le groupe de modifications sera <strong>fermé</strong> après cet envoi"
+msgid "The changeset is going to be <strong>closed</strong> after this upload"
+msgstr "Le groupe de modifications sera <strong>fermé</strong> après cet envoi"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:57
@@ -9895,6 +9887,6 @@
 "Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong>"
 msgstr[0] ""
-"Envoi d’<strong>{0} objet</strong> vers <strong>un groupe de "
-"modifications</strong>"
+"Envoi d’<strong>{0} objet</strong> vers <strong>un groupe de modifications</"
+"strong>"
 msgstr[1] ""
 "Envoi de <strong>{0} objets</strong> vers <strong>un groupe de "
@@ -9910,6 +9902,6 @@
 "<strong>1 request</strong>"
 msgstr[0] ""
-"Envoi d’<strong>{0} objet</strong> vers <strong>un groupe de "
-"modifications</strong> via <strong>une requête</strong>"
+"Envoi d’<strong>{0} objet</strong> vers <strong>un groupe de modifications</"
+"strong> via <strong>une requête</strong>"
 msgstr[1] ""
 "Envoi de <strong>{0} objets</strong> vers <strong>un groupe de "
@@ -9945,6 +9937,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 ""
 "Envoi de <strong>{0} objets</strong> vers <strong>plusieurs groupes de "
@@ -10004,7 +9996,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 ""
 "Cliquer sur ''<strong>{0}</strong>'' pour continuer l’envoi vers des groupes "
@@ -10018,5 +10010,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -10034,5 +10026,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..."
@@ -10043,6 +10035,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 "L’exception est ignorée car l’envoi a été annulé. Exception : {0}"
 
@@ -10127,6 +10118,6 @@
 msgstr ""
 "<html>Impossible d’envoyer {0} objets en une requête car la<br>taille "
-"maximale du groupe de modifications {1} sur le serveur ''{2}'' est "
-"dépassée.</html>"
+"maximale du groupe de modifications {1} sur le serveur ''{2}'' est dépassée."
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
@@ -10279,7 +10270,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 ""
 "<html>Les données dans le calque GPX ''{0}'' ont été téléchargées depuis le "
@@ -10308,7 +10299,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 ""
 "<html>Les données dans le calque GPX ''{0}'' ont été téléchargées depuis le "
@@ -10375,6 +10366,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 ""
 "<html>L’envoi de données GPS non traitées <br>sur la carte est considéré "
@@ -10570,6 +10561,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 ""
 "<html>L’envoi de données GPS non traitées <br>sur la carte est considéré "
@@ -10631,7 +10622,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 ""
 "<html>Prenez une photo de votre GPS quand il affiche l’heure.<br>Affichez "
@@ -10774,6 +10765,6 @@
 "<html>Correspondance <b>{0}</b> de <b>{1}</b> photo avec la trace GPX.</html>"
 msgstr[1] ""
-"<html>Correspondance <b>{0}</b> de <b>{1}</b> photos avec la trace "
-"GPX.</html>"
+"<html>Correspondance <b>{0}</b> de <b>{1}</b> photos avec la trace GPX.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
@@ -11184,7 +11175,7 @@
 "to use the Access Token in this JOSM session only.</html>"
 msgstr ""
-"<html>Cocher pour sauvegarder l’autorisation d’accès dans les "
-"préférences.<br>Décocher pour limiter l’autorisation d’accès à cette session "
-"uniquement.</html>"
+"<html>Cocher pour sauvegarder l’autorisation d’accès dans les préférences."
+"<br>Décocher pour limiter l’autorisation d’accès à cette session uniquement."
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
@@ -11249,6 +11240,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 ""
 "<html>Lancer une procédure automatisée pour obtenir une autorisation d’accès "
@@ -11281,8 +11272,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 ""
 "Veuillez entrer votre nom d’utilisateur et votre mot de passe OSM. Le mot de "
@@ -11335,6 +11326,6 @@
 "<html>Vous avez récupéré avec succès une autorisation d’accès OAuth depuis "
 "le site OSM. Cliquez sur <strong>{0}</strong> pour accepter l’autorisation. "
-"JOSM l’utilisera dans les prochaines requêtes pour accéder à l’API "
-"OSM.</html>"
+"JOSM l’utilisera dans les prochaines requêtes pour accéder à l’API OSM.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:329
@@ -11418,6 +11409,6 @@
 "<html>Le processus automatisé pour récupérer l’autorisation d’accès "
 "OAuth<br>à partir du serveur OSM a échoué parce que JOSM n’a pas été capable "
-"de construire<br>une URL de connexion valide à partir de l’URL OAuth "
-"''{0}''.<br>Veuillez vérifier vos préférences et réessayer.</html>"
+"de construire<br>une URL de connexion valide à partir de l’URL OAuth ''{0}''."
+"<br>Veuillez vérifier vos préférences et réessayer.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:490
@@ -11425,11 +11416,11 @@
 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 ""
 "<html>Le processus automatisé pour récupérer l’autorisation d’accès "
-"OAuth<br>depuis le serveur OSM a échoué. JOSM n’a pas pu se connecter à "
-"{0}<br>pour l’utilisateur {1}.<br>Veuillez vérifier le nom d’utilisateur et "
-"le mot de passe et réessayer.</html>"
+"OAuth<br>depuis le serveur OSM a échoué. JOSM n’a pas pu se connecter à {0}"
+"<br>pour l’utilisateur {1}.<br>Veuillez vérifier le nom d’utilisateur et le "
+"mot de passe et réessayer.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:58
@@ -11544,11 +11535,9 @@
 #, java-format
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
-msgstr ""
-"Le site OSM n’a pas retourné une session cookie en réponse à ''{0}'',"
+msgstr "Le site OSM n’a pas retourné une session cookie en réponse à ''{0}'',"
 
 #: ../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 ""
 "L’identification OAuth de l’utilisateur ''{0}'' avec le mot de passe ''***'' "
@@ -11652,6 +11641,6 @@
 msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
 msgstr ""
-"<html>La récupération de la requête d’accès OAuth depuis ''{0}'' a "
-"échoué.</html>"
+"<html>La récupération de la requête d’accès OAuth depuis ''{0}'' a échoué.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:130
@@ -11694,8 +11683,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 ""
 "<html>JOSM a récupéré avec succès une autorisation d’accès. JOSM va "
@@ -11705,6 +11694,6 @@
 "alors à cette fenêtre et cliquez sur <strong>{0}</strong><br>Si le "
 "navigateur externe ne se lance pas, vous pouvez copier cette URL "
-"d’autorisation et la coller dans la barre d’adresse de votre "
-"navigateur.</html>"
+"d’autorisation et la coller dans la barre d’adresse de votre navigateur.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:275
@@ -11801,14 +11790,14 @@
 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>"
-msgstr ""
-"<html>L’autorisation d’accès ''{1}'' est reconnue par le serveur OSM "
-"''{0}''.<br>Cependant le test pour récupérer les détails de l’utilisateur de "
-"cette autorisation a échoué.<br>Selon les droits que vous possédez avec "
-"cette autorisation, vous pouvez l’utiliser pour<br>envoyer des données, "
-"envoyer des traces GPS et/ou accéder à d’autres ressources protégées.</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 ""
+"<html>L’autorisation d’accès ''{1}'' est reconnue par le serveur OSM ''{0}''."
+"<br>Cependant le test pour récupérer les détails de l’utilisateur de cette "
+"autorisation a échoué.<br>Selon les droits que vous possédez avec cette "
+"autorisation, vous pouvez l’utiliser pour<br>envoyer des données, envoyer "
+"des traces GPS et/ou accéder à d’autres ressources protégées.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
@@ -11841,11 +11830,11 @@
 #: ../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 ""
 "<html>Le test a échoué car le serveur a retourné une erreur interne.<br>JOSM "
-"ne sait pas si l’autorisation est valide. Veuillez réessayer plus "
-"tard.</html>"
+"ne sait pas si l’autorisation est valide. Veuillez réessayer plus tard.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
@@ -11897,5 +11886,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 "Veuillez sélectionner la ligne à supprimer."
@@ -11924,6 +11913,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
 msgid "Explicit waypoints with time estimated from track position."
-msgstr ""
-"Points avec un horodatage estimé à partir de la position de la trace."
+msgstr "Points avec un horodatage estimé à partir de la position de la trace."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
@@ -12190,6 +12178,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
 msgid "Only interesting direction hints (e.g. with oneway tag)."
-msgstr ""
-"Seulement pour les directions intéressantes (sens unique par exemple)"
+msgstr "Seulement pour les directions intéressantes (sens unique par exemple)"
 
 #. only on the head of a way
@@ -12273,6 +12260,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 ""
 "Dessiner les flèches de direction en utilisant un aperçu des données plutôt "
@@ -12339,6 +12325,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 "Appliquer un anticrénelage aux contours de la carte."
 
@@ -12412,5 +12397,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 "Activer les valeurs par défauts"
@@ -12430,10 +12415,8 @@
 #: ../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>:"
-msgstr[0] ""
-"Le greffon suivant a été téléchargé <strong>avec succès</strong> :"
+msgstr[0] "Le greffon suivant a été téléchargé <strong>avec succès</strong> :"
 msgstr[1] ""
 "Les greffons suivants ont été téléchargés <strong>avec succès</strong> :"
@@ -12562,6 +12545,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 ""
 "<p>De plus, les raccourcis claviers sont activés lorsque les actions sont "
@@ -12580,9 +12563,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 ""
 "<p>La liste de sélection des touches inclut toutes les touches qui existent "
@@ -12895,6 +12878,6 @@
 #, java-format
 msgid ""
-"<html>Failed to load the list of style sources "
-"from<br>''{0}''.<br><br>Details (untranslated):<br>{1}</html>"
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
 msgstr ""
 "<html>Impossible de télécharger la liste des sources de modèles "
@@ -12909,5 +12892,5 @@
 "Actuellement il est ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #, java-format
 msgid ""
@@ -12917,18 +12900,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 ""
@@ -12937,5 +12920,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 ""
@@ -12944,5 +12927,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 ""
@@ -12951,9 +12934,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 "Trier le menu des pré-réglages"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
 msgid "Tagging Presets"
 msgstr "Pré-réglages des attribus"
@@ -13067,10 +13050,10 @@
 #, 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 ""
 "<html>La construction de l’URL ''{0}'' pour valider le serveur de l’API OSM "
-"a échoué.<br>Veuillez vérifier l’orthographe de ''{1}'' et "
-"recommencer.</html>"
+"a échoué.<br>Veuillez vérifier l’orthographe de ''{1}'' et recommencer.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
@@ -13093,11 +13076,11 @@
 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 ""
 "<html>La récupération de la liste des groupes de modifications depuis le "
 "serveur d’API OSM à<br>''{1}'' a échoué. Le serveur a retourné le code {0} "
-"au lieu de 200.<br>Veuillez vérifiez l’orthographe de {1} et "
-"recommencer.</html>"
+"au lieu de 200.<br>Veuillez vérifiez l’orthographe de {1} et recommencer.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
@@ -13108,6 +13091,6 @@
 "spelling of ''{0}'' and validate again.</html>"
 msgstr ""
-"<html>Le serveur de l’API OSM à ''{0}'' n’a pas retourné une réponse "
-"valide.<br>''{0}'' n’est probablement pas un serveur d’API OSM.<br>Veuillez "
+"<html>Le serveur de l’API OSM à ''{0}'' n’a pas retourné une réponse valide."
+"<br>''{0}'' n’est probablement pas un serveur d’API OSM.<br>Veuillez "
 "vérifier l’orthographe de ''{0}'' et recommencer.</html>"
 
@@ -13167,6 +13150,6 @@
 "passe est enregistré en clair dans le dossier des préférences. De plus, il "
 "est transmis <strong>sans cryptage</strong> lors de chaque requête envoyée "
-"au serveur OSM. <strong>N’utilisez pas de mot de passe "
-"sensible.</strong></p></body></html>"
+"au serveur OSM. <strong>N’utilisez pas de mot de passe sensible.</strong></"
+"p></body></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:117
@@ -13187,8 +13170,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
-msgstr ""
-"Attention : la récupération des autorisations d’accès OAuth a échoué."
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgstr "Attention : la récupération des autorisations d’accès OAuth a échoué."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
@@ -13205,6 +13186,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 ""
 "Vous possédez déjà une autorisation d’accès au serveur OSM utilisant OAuth."
@@ -13305,9 +13285,9 @@
 #: ../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)"
-msgstr ""
-"Utiliser les paramètres du système (désactivé. Démarrez JOSM avec <tt>-"
-"Djava.net.useSystemProxies=true</tt> pour l’activer)"
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+"Utiliser les paramètres du système (désactivé. Démarrez JOSM avec <tt>-Djava."
+"net.useSystemProxies=true</tt> pour l’activer)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:256
@@ -13365,5 +13345,5 @@
 #, java-format
 msgid "Unknown requisite: {0}"
-msgstr ""
+msgstr "Prérequis inconnu : {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
@@ -13444,4 +13424,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 "Changer les propriétés"
@@ -13635,5 +13616,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
@@ -13658,5 +13639,5 @@
 msgstr "Analyse de la réponse du serveur..."
 
-#: ../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}''"
@@ -13680,6 +13661,5 @@
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br>Error is:<br>{1}</html>"
-msgstr ""
-"<html>Impossible de lire le fichier ''{0}''.<br>Erreur :<br>{1}</html>"
+msgstr "<html>Impossible de lire le fichier ''{0}''.<br>Erreur :<br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:76
@@ -13831,6 +13811,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 ""
 "Aucune primitive avec l’identifiant {0} n’a été trouvée dans le jeu de "
@@ -13932,6 +13911,5 @@
 #, java-format
 msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
-msgstr ""
-"La préférence ''{0}'' est manquante. Impossible d’initialiser OsmApi."
+msgstr "La préférence ''{0}'' est manquante. Impossible d’initialiser OsmApi."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:165
@@ -13955,5 +13933,5 @@
 
 #: ../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}''."
@@ -13962,5 +13940,5 @@
 "il est \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:278
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -13970,16 +13948,16 @@
 "inattendue. Actuellement il est \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
 msgid "Creating changeset..."
 msgstr "Création d’un groupe de modifications…"
 
-#: ../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 "Groupe de modifications {0} ouvert avec succès"
 
-#: ../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}."
@@ -13988,49 +13966,48 @@
 "il est {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349
 msgid "Updating changeset..."
 msgstr "Mise à jour du groupe de modifications..."
 
-#: ../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 "Mise à jour du groupe de modifications {0}…"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:388
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389
 msgid "Closing changeset..."
 msgstr "Fermeture du groupe de modifications…"
 
-#: ../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 "Aucun groupe de modifications pour l’envoi."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
 msgid "Preparing upload request..."
 msgstr "Préparation de la requête d’envoi des données..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447
 msgid "Waiting 10 seconds ... "
 msgstr "En attente pendant 10 secondes… "
 
-#: ../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 "Nouvelle tentative {0} de {1} dans {2} secondes ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:458
 msgid "OK - trying again."
 msgstr "OK - réessayez."
 
-#: ../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 "Nouvelle tentative {0} de {1}."
 
-#: ../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 ""
-"Le groupe de modifications est vide. Impossible d’envoyer les données."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:636
+msgstr "Le groupe de modifications est vide. Impossible d’envoyer les données."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:637
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
@@ -14039,5 +14016,5 @@
 "Actuellement il est {0}."
 
-#: ../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}."
@@ -14247,4 +14224,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})"
@@ -14260,15 +14238,15 @@
 msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
 msgstr ""
-"<html>Une erreur est survenue lors de l’enregistrement.<br>erreur "
-":<br>{0}</html>"
+"<html>Une erreur est survenue lors de l’enregistrement.<br>erreur :<br>{0}</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error "
-"is:<br>{0}</html>"
-msgstr ""
-"<html>Une erreur est survenue lors du chargement d’une sauvegarde.<br>Erreur "
-":<br>{0}</html>"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
+"html>"
+msgstr ""
+"<html>Une erreur est survenue lors du chargement d’une sauvegarde."
+"<br>Erreur :<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
@@ -14295,6 +14273,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 ""
 "Attributs obligatoires manquants dans les limites. Actuellement lon min = "
@@ -14342,6 +14320,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 ""
 "La valeur pour l’attribut ''ref'' sur le membre de la relation {0} est "
@@ -14697,5 +14674,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:112
 msgid "Download skipped"
-msgstr ""
+msgstr "Téléchargement sauté"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:118
@@ -14835,6 +14812,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 ""
 "<html>Le greffon {0} requiert la version {1} de JOSM. Sa version actuelle "
@@ -15066,6 +15043,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 ""
 "Attention : l’analyse du fichier ''{0}'' concernant l’information du greffon "
@@ -15074,5 +15050,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:109
 msgid "Processing plugin site cache icon files..."
-msgstr ""
+msgstr "Procède à la mise en cache des icônes du plugin du site."
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:133
@@ -15138,5 +15114,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"
@@ -15208,6 +15184,6 @@
 "the server URL in your preferences and your internet connection.</html>"
 msgstr ""
-"<html>L’initialisation de la communication avec le serveur OSM {0} a "
-"échoué.<br>Vérifiez l’URL du serveur dans vos préférences et votre connexion "
+"<html>L’initialisation de la communication avec le serveur OSM {0} a échoué."
+"<br>Vérifiez l’URL du serveur dans vos préférences et votre connexion "
 "Internet.</html>"
 
@@ -15221,7 +15197,7 @@
 msgstr ""
 "<html>L’authentification au du serveur OSM ''{0}'' a échoué.<br>Vous "
-"utilisez OAuth mais<br>aucune autorisation d’accès OAuth n’est "
-"configurée.<br>Veuillez ouvrir la fenêtre des préférences et générer ou "
-"entrer une autorisation d’accès.</html>"
+"utilisez OAuth mais<br>aucune autorisation d’accès OAuth n’est configurée."
+"<br>Veuillez ouvrir la fenêtre des préférences et générer ou entrer une "
+"autorisation d’accès.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:78
@@ -15232,8 +15208,8 @@
 "reference to relation {0}, and upload again.</html>"
 msgstr ""
-"<html>La suppression de la <strong>relation {0}</strong> a "
-"<strong>échoué</strong>. La relation {1} s’y rapporte toujours.<br>Veuillez "
-"charger la relation {1}, enlever les références à la relation {0} et "
-"recommencer l’envoi.</html>"
+"<html>La suppression de la <strong>relation {0}</strong> a <strong>échoué</"
+"strong>. La relation {1} s’y rapporte toujours.<br>Veuillez charger la "
+"relation {1}, enlever les références à la relation {0} et recommencer "
+"l’envoi.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:105
@@ -15241,6 +15217,6 @@
 msgid ""
 "<html>Uploading to the server <strong>failed</strong> because your "
-"current<br>dataset violates a precondition.<br>The error message "
-"is:<br>{0}</html>"
+"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
+"html>"
 msgstr ""
 "<html>L’envoi vers le serveur <strong>a échoué</strong> car votre jeu "
@@ -15251,7 +15227,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 ""
 "<html>L’identification avec le nom d’utilisateur ''{0}'' a échoué auprès du "
@@ -15262,7 +15238,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 ""
 "<html>L’identification avec l’autorisation d’accès ''{0}'' a échoué auprès "
@@ -15273,8 +15249,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 ""
 "<html>L’authentification avec l’autorisation d’accès ''{0}'' a échoué auprès "
@@ -15300,7 +15276,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 ""
 "<html>La communication avec le serveur OSM ''{0}'' a échoué. Le serveur a "
@@ -15376,6 +15352,6 @@
 msgstr ""
 "<html>L’envoi ou le téléchargement des données depuis<br>''{0}''<br>a échoué "
-"à cause d’un problème avec les données transmises.<br>Détails (non traduits) "
-": {1}</html>"
+"à cause d’un problème avec les données transmises.<br>Détails (non "
+"traduits) : {1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:336
@@ -15391,11 +15367,10 @@
 #, java-format
 msgid ""
-"<html>The OSM server<br>''{0}''<br>reported an internal server "
-"error.<br>This is most likely a temporary problem. Please try again "
-"later.</html>"
+"<html>The OSM server<br>''{0}''<br>reported an internal server error."
+"<br>This is most likely a temporary problem. Please try again later.</html>"
 msgstr ""
 "<html>Le serveur OSM<br>''{0}''<br>a rapporté une erreur interne.<br>Il "
-"s’agit probablement d’un problème temporaire. Veuillez réessayer plus "
-"tard.</html>"
+"s’agit probablement d’un problème temporaire. Veuillez réessayer plus tard.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
@@ -15406,7 +15381,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 ""
 "La zone que vous essayer de télécharger est trop grande ou votre requête "
@@ -15448,12 +15423,12 @@
 "<html>The server reports that an object is deleted.<br><strong>Uploading "
 "failed</strong> if you tried to update or delete this object.<br> "
-"<strong>Downloading failed</strong> if you tried to download this "
-"object.<br><br>The error message is:<br>{0}</html>"
+"<strong>Downloading failed</strong> if you tried to download this object."
+"<br><br>The error message is:<br>{0}</html>"
 msgstr ""
 "<html>Le serveur a rapporté que l’objet a été supprimé.<br><strong>L’envoi a "
 "échoué</strong> parce que vous avez essayé de mettre à jour ou de supprimer "
 "cet objet.<br><strong>Le téléchargement a échoué</strong> parce que vous "
-"avez essayé de télécharger cet objet.<br>Le message d’erreur est "
-":<br>{0}</html>"
+"avez essayé de télécharger cet objet.<br>Le message d’erreur est :<br>{0}</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/I18n.java:439
@@ -15558,6 +15533,6 @@
 msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}"
 msgstr ""
-"Attention : la lecture du message du jour depuis ''{0}'' a échoué. Exception "
-": {1}"
+"Attention : la lecture du message du jour depuis ''{0}'' a échoué. "
+"Exception : {1}"
 
 #: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:60
@@ -15959,8 +15934,10 @@
 "Your action is being reverted."
 msgstr ""
+"Aligner générerait des nœuds situés hors des limites de la planète. Votre "
+"action est annulée."
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
 msgid "I''m ready!"
-msgstr ""
+msgstr "Je sui prêt"
 
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
@@ -16009,6 +15986,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>"
@@ -16035,6 +16012,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"
@@ -16072,6 +16049,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"
@@ -16087,7 +16064,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"
@@ -16138,9 +16115,29 @@
 msgstr "Numéros :"
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:134
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#, fuzzy
+msgid "Big buildings mode"
+msgstr "Définir la grandeur des bâtiments"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#, fuzzy
+msgid "Rotate crosshair"
+msgstr "Rotation à droite"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#, fuzzy
+msgid "Advanced settings"
+msgstr "Configurer les réglages avancés"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#, fuzzy
+msgid "Building tag:"
+msgstr "Bâtiment"
+
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:234
 msgid "Cannot place building outside of the world."
 msgstr "Impossible de construire un bâtiment en dehors du monde."
 
-#: ../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"
@@ -16149,35 +16146,48 @@
 #: ../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 "Définir la grandeur des bâtiments"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:24
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
 msgid "Use Address dialog"
 msgstr "Utiliser la fenêtre d’adresse"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#, fuzzy
+msgid "Auto-select building"
+msgstr "Créer un bâtiment"
+
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
 msgid "Buildings width:"
 msgstr "Largeur des bâtiments :"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Length step:"
 msgstr "Longueur de l’escalier :"
 
-#: ../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
+#, fuzzy
+msgid "Advanced..."
+msgstr "Avancé"
+
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:65
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 msgid "Draw buildings"
 msgstr "Dessiner des bâtiments"
 
-#: ../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"
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:379
+#, fuzzy
+msgid "Point on the corner of the building to start drawing"
+msgstr "Pointez le coin du bâtiment pour commencer à dessiner"
+
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:381
+#, fuzzy
+msgid "Point on opposite end of the building"
 msgstr "Point opposé du bâtiment"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
-msgid "Set width of building"
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:383
+#, fuzzy
+msgid "Set width of the building"
 msgstr "Définir la largeur des bâtiments"
 
@@ -16370,7 +16380,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--waterway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -16380,5 +16390,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -16388,5 +16398,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -16402,5 +16412,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -16410,5 +16420,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -16416,8 +16426,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 "eau"
@@ -16439,5 +16449,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -16446,5 +16456,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -16453,5 +16463,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -16460,5 +16470,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -16467,5 +16477,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -16474,10 +16484,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 "adresse"
@@ -16506,19 +16516,16 @@
 #: ../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 ""
 "Prise en charge WMS du cadastre français<br>Merci de lire les conditions "
-"d’utilisation avant tout envoi de données créées à partir de ce "
-"greffon.<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><b"
-"r>"
+"d’utilisation avant tout envoi de données créées à partir de ce greffon."
+"<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>"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98
@@ -16529,6 +16536,6 @@
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
-"<html>Valeur de la clé \"source\" lorsque son enregistrement est "
-"activé</html>"
+"<html>Valeur de la clé \"source\" lorsque son enregistrement est activé</"
+"html>"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106
@@ -16724,6 +16731,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:221
 msgid "Please, enable auto-sourcing and check cadastre millesime."
-msgstr ""
-"Veuillez activer l’auto-sourcing et vérifier le millésime du cadastre."
+msgstr "Veuillez activer l’auto-sourcing et vérifier le millésime du cadastre."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66
@@ -16874,6 +16880,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24
 msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
-"Télécharger la zone depuis le cache (seulement si le cache est activé)"
+msgstr "Télécharger la zone depuis le cache (seulement si le cache est activé)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
@@ -16985,6 +16990,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 "Calque vide"
@@ -17175,4 +17180,52 @@
 msgstr "Aucun calque GPX trouvé."
 
+#: ../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 "Modifier un zoo"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#, fuzzy
+msgid "Name:"
+msgstr "Nom"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#, fuzzy
+msgid "CmdLine:"
+msgstr "Coordonnées :"
+
+#: ../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
+#, fuzzy, java-format
+msgid "Delete tool \"{0}\"?"
+msgstr "Supprimer le nœud {0}"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:74
+msgid "Are you sure?"
+msgstr "Êtes-vous sûr(e) ?"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
+#, fuzzy
+msgid "New tool..."
+msgstr "Nouveau rôle"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
+#, fuzzy
+msgid "Install"
+msgstr "Zone industrielle"
+
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
 msgid "Position only"
@@ -17297,6 +17350,6 @@
 msgstr ""
 "Impossible de lire la bibliothèque rxtxSerial. Si vous avez besoin d’aide "
-"pour l’installer, essayez la page d’accueil deGlobalsat sur "
-"http://www.raphael-mack.de/josm-globalsat-gpx-import-plugin/"
+"pour l’installer, essayez la page d’accueil deGlobalsat sur http://www."
+"raphael-mack.de/josm-globalsat-gpx-import-plugin/"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
@@ -17446,5 +17499,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#. 
+#.
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -17565,6 +17618,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 ""
 "Nombre maximum de segments autorisés dans chaque chemin généré (250 par "
@@ -17589,7 +17641,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 ""
 "Précision de la simplification des lignes par la méthode Douglas-Peucker, en "
@@ -17847,6 +17898,5 @@
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:94
 msgid "One of the selected ways is already part of another multipolygon."
-msgstr ""
-"Un des chemins sélectionné fait déjà partie d’un autre multipolygone."
+msgstr "Un des chemins sélectionné fait déjà partie d’un autre multipolygone."
 
 #. Commit
@@ -17889,8 +17939,7 @@
 "new server? (Strongly recommended)</html>"
 msgstr ""
-"<html>Le greffon openstreetbugs utilise l’ancien serveur sur "
-"appspot.com.<br>Un nouveau serveur est disponible sur "
-"schokokeks.org.<br>Voulez-vous passer au nouveau serveur ? (fortement "
-"recommandé)"
+"<html>Le greffon openstreetbugs utilise l’ancien serveur sur appspot.com."
+"<br>Un nouveau serveur est disponible sur schokokeks.org.<br>Voulez-vous "
+"passer au nouveau serveur ? (fortement recommandé)"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:109
@@ -17903,7 +17952,7 @@
 "upload this data. Maybe you have selected the wrong layer?"
 msgstr ""
-"<html>Les données sélectionnées contiennent des données "
-"d’OpenStreetBugs.<br>Vous ne pouvez pas envoyer ces données. Peut-être avez-"
-"vous sélectionné le mauvais calque ?"
+"<html>Les données sélectionnées contiennent des données d’OpenStreetBugs."
+"<br>Vous ne pouvez pas envoyer ces données. Peut-être avez-vous sélectionné "
+"le mauvais calque ?"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
@@ -17918,6 +17967,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 ""
 "L’entête contient plusieurs valeurs et ne peut être décrit en une seule "
@@ -18034,6 +18082,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 ""
 "Vous avez des modifications non-sauvegardées dans votre file d’attente. "
@@ -18088,9 +18135,8 @@
 
 #: ../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:"
-msgstr ""
-"Écrire l’information de la position dans l’entête exif des fichiers suivants "
-":"
+msgid "Write position information into the exif header of the following files:"
+msgstr ""
+"Écrire l’information de la position dans l’entête exif des fichiers "
+"suivants :"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
@@ -18121,6 +18167,5 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
 msgid "Writing position information to image files..."
-msgstr ""
-"Écriture de l’information sur la position dans les fichiers images..."
+msgstr "Écriture de l’information sur la position dans les fichiers images..."
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
@@ -18144,6 +18189,6 @@
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr ""
-"<html><h3>Des vieilles sauvegardes ont été trouvées dans le dossier image "
-"!</h3>"
+"<html><h3>Des vieilles sauvegardes ont été trouvées dans le dossier image !</"
+"h3>"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
@@ -18410,6 +18455,5 @@
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
 msgid "Remote Control has been asked to load data from the API."
-msgstr ""
-"Il a été demandé à Remote Control de charger les données depuis l’API."
+msgstr "Il a été demandé à Remote Control de charger les données depuis l’API."
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
@@ -18442,13 +18486,13 @@
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
 msgid "Revert changeset fully"
-msgstr ""
+msgstr "Annuler la liste des changements dans son ensemble"
 
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert selection only"
-msgstr ""
+msgstr "Annuler seulement la sélection"
 
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
 msgid "Revert selection and restore deleted objects"
-msgstr ""
+msgstr "Annuler la sélection et restaurer les objets supprimés"
 
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
@@ -18462,5 +18506,5 @@
 msgstr "Rétablir"
 
-#: ../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}"
@@ -18470,5 +18514,5 @@
 #, java-format
 msgid "Target of type {0} with id {1} has invalid version"
-msgstr ""
+msgstr "La cible de type {0} avec un id {1} est une version invalide"
 
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15
@@ -18497,13 +18541,13 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:60
 msgid "Confirm"
-msgstr ""
+msgstr "Confirmer"
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:64
 msgid "Fetching missing primitives"
-msgstr ""
+msgstr "Récupération des primitives manquantes"
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:75
 msgid "Downloading changeset"
-msgstr ""
+msgstr "Téléchargement du set de changements"
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:98
@@ -18511,4 +18555,41 @@
 msgid "Revert changeset #{0}"
 msgstr "Réversion du groupe de changement #{0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:78
+#, fuzzy
+msgid "Road Sign Plugin"
+msgstr "Chargement des greffons"
+
+#: ../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 "Impossible de lire la source des balises : {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
+#, fuzzy, java-format
+msgid "Error parsing tagging preset from ''{0}'':\n"
+msgstr "Analyse de la liste des greffons du site ''{0}''"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:104
+#, fuzzy, java-format
+msgid "Sign {0}"
+msgstr "Sélection : {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:111
+#, fuzzy, java-format
+msgid "Additional sign {0}"
+msgstr "Ajouter la relation {0}"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -18538,6 +18619,5 @@
 #, java-format
 msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-"Supprimer la relation ''{0}'' à la position {1} de la relation ''{2}''"
+msgstr "Supprimer la relation ''{0}'' à la position {1} de la relation ''{2}''"
 
 #. TODO Use constructor with shortcut
@@ -18616,4 +18696,15 @@
 msgstr "Entrez les valeurs du poids"
 
+#: ../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 "Simplifier le chemin"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
+#, fuzzy
+msgid "Delete unnecessary nodes from an area."
+msgstr "Supprimer les nœuds inutiles du chemin"
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
 msgid "Slippy Map"
@@ -18830,6 +18921,5 @@
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
-msgstr ""
-"Ouvrir l’outil de vérification des balises afin de les prévisualiser."
+msgstr "Ouvrir l’outil de vérification des balises afin de les prévisualiser."
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43
@@ -19206,6 +19296,6 @@
 msgstr ""
 "<html>Cette interdiction de tourner a été modifiée à l’extérieur de "
-"l’éditeur.<br>Vous ne pouvez pas appliquer ni continuer vos "
-"modifications.<br>Voulez-vous créer un conflit et fermer l’éditeur ?</html>"
+"l’éditeur.<br>Vous ne pouvez pas appliquer ni continuer vos modifications."
+"<br>Voulez-vous créer un conflit et fermer l’éditeur ?</html>"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:627
@@ -19215,7 +19305,6 @@
 "resolve this conflict first, then try again.</html>"
 msgstr ""
-"<html>Le calque ''{0}'' a déjà un conflit pour "
-"l’objet<br>''{1}''.<br>Veuillez d’abord résoudre ce conflit puis "
-"réessayer.</html>"
+"<html>Le calque ''{0}'' a déjà un conflit pour l’objet<br>''{1}''."
+"<br>Veuillez d’abord résoudre ce conflit puis réessayer.</html>"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:633
@@ -19426,6 +19515,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:164
 msgid "Display and manage turn restrictions in the current data set"
-msgstr ""
-"Afficher et gérer les interdictions de tourner dans le jeu de données"
+msgstr "Afficher et gérer les interdictions de tourner dans le jeu de données"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
@@ -19455,6 +19543,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 ""
 "Le développement du greffon \"interdiction de tourner\" a été sponsorisé par "
@@ -19481,6 +19569,6 @@
 "L'éditeur de base peut éventuellement afficher la liste des \"via-objets\" "
 "d'une restriction de tourner. S'il est activé, on peut les modifier dans "
-"l'éditeur de base aussi. Si elle est désactivée, l'édition de la \"via-"
-"objets\" est possible dans l'éditeur avancé uniquement"
+"l'éditeur de base aussi. Si elle est désactivée, l'édition de la \"via-objets"
+"\" est possible dans l'éditeur avancé uniquement"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:60
@@ -19509,4 +19597,6 @@
 "Assuming the default value ''set-a''."
 msgstr ""
+"Attention: la préférence avec la clé \"{0}\" a une valeur non supportée \"{1}"
+"\". Assumons la valeur par défaut \"set-a\"."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:48
@@ -19552,8 +19642,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 ""
 
@@ -19615,8 +19705,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 ""
 
@@ -19681,7 +19771,7 @@
 "turn restriction has {0} ways in this role. Please remove {1} of them."
 msgstr ""
-"Une interdiction de tourner nécessite un seul chemin avec le rôle "
-"<tt>from</tt>. Cette interdiction de tourner a {0} chemins avec ce rôle. "
-"Veuillez en retirer {1}."
+"Une interdiction de tourner nécessite un seul chemin avec le rôle <tt>from</"
+"tt>. Cette interdiction de tourner a {0} chemins avec ce rôle. Veuillez en "
+"retirer {1}."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:44
@@ -19691,7 +19781,7 @@
 "restriction has {0} ways in this role. Please remove {1} of them."
 msgstr ""
-"Une interdiction de tourner nécessite un seul chemin avec le rôle "
-"<tt>to</tt>. Cette interdiction de tourner a {0} chemins avec ce rôle. "
-"Veuillez en retirer {1}."
+"Une interdiction de tourner nécessite un seul chemin avec le rôle <tt>to</"
+"tt>. Cette interdiction de tourner a {0} chemins avec ce rôle. Veuillez en "
+"retirer {1}."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:57
@@ -19711,4 +19801,6 @@
 msgid "Go to Basic Editor and select standard vehicle type based exceptions"
 msgstr ""
+"Utiliser l'éditeur basique et sélectionner les exceptions basées sur les "
+"types de véhicules standards"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java:37
@@ -19746,15 +19838,15 @@
 #, java-format
 msgid ""
-"This turn restriction uses the OSM node <span class=\"object-"
-"name\">{0}</span> as member with role <tt>{1}</tt>."
-msgstr ""
-"Cette interdiction de tourner utilise le noeud OSM <span class=\"object-"
-"name\">{0}</span> comme membre avec le rôle <tt>{1}</tt>."
+"This turn restriction uses the OSM node <span class=\"object-name\">{0}</"
+"span> as member with role <tt>{1}</tt>."
+msgstr ""
+"Cette interdiction de tourner utilise le noeud OSM <span class=\"object-name"
+"\">{0}</span> comme membre avec le rôle <tt>{1}</tt>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:51
 #, 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 ""
 "Cette interdiction de tourner utilise la relation OSM <span class=\"object-"
@@ -19860,6 +19952,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:79
 msgid "Use the error layer to display problematic elements."
-msgstr ""
-"Utiliser le calque d’erreur pour afficher les éléments problématiques."
+msgstr "Utiliser le calque d’erreur pour afficher les éléments problématiques."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82
@@ -20091,6 +20182,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:24
 msgid "Checks for ways with identical consecutive nodes."
-msgstr ""
-"Vérifier si les chemins contiennent des nœuds consécutifs identiques."
+msgstr "Vérifier si les chemins contiennent des nœuds consécutifs identiques."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:37
@@ -20118,5 +20208,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:151
 msgid "No style in multipolygon relation"
-msgstr ""
+msgstr "Pas de style dans une relation multipolygone"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:169
@@ -20126,9 +20216,9 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:180
 msgid "Style for outer way mismatches"
-msgstr ""
+msgstr "Les styles des chemins extérieurs ne correspondent pas"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:186
 msgid "No style for multipolygon"
-msgstr ""
+msgstr "Pas de style pour un multipolygone"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:191
@@ -20138,5 +20228,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:213
 msgid "Multipolygon inner way is outside"
-msgstr ""
+msgstr "Le chemin intérieur du multipolygone est à l'extérieur"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:216
@@ -20226,26 +20316,26 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:44
 msgid "Relation checker :"
-msgstr ""
+msgstr "Vérificateur de relation :"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:45
 msgid "This plugin checks for errors in relations."
-msgstr ""
+msgstr "Ce greffon vérifie les erreurs dans les relations."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115
 msgid "Relation type is unknown"
-msgstr ""
+msgstr "Le type de relation est inconnu"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:145
 msgid "Relation is empty"
-msgstr ""
+msgstr "La relation est vide"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:155
 msgid "<empty>"
-msgstr ""
+msgstr "<vide>"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:163
 #, java-format
 msgid "Role {0} missing"
-msgstr ""
+msgstr "Le rôle {0} manque"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:164
@@ -20256,29 +20346,29 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:201
 msgid "Role verification problem"
-msgstr ""
+msgstr "Problème de vérification de rôle"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:169
 #, java-format
 msgid "Number of {0} roles too low ({1})"
-msgstr ""
+msgstr "Nombre de rôles {0} trop bas ({1})"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:175
 #, java-format
 msgid "Number of {0} roles too high ({1})"
-msgstr ""
+msgstr "Nombre de rôles {0} trop élevé ({1})"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:183
 #, java-format
 msgid "Member for role {0} of wrong type"
-msgstr ""
+msgstr "Membre du rôle {0} du mauvais type"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:194
 #, java-format
 msgid "Role {0} unknown"
-msgstr ""
+msgstr "Rôle {0} inconnu"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:200
 msgid "Empty role found"
-msgstr ""
+msgstr "Rôle vide trouvé"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:22
@@ -20344,8 +20434,10 @@
 msgid "Tag value contains character with code less than 0x20"
 msgstr ""
+"La valeur de la balise contient un caractère avec un code inférieur à 0x20"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479
 msgid "Tag key contains character with code less than 0x20"
 msgstr ""
+"La clé de la balise contient un caractère avec un code inférieur à 0x20"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485
@@ -20389,6 +20481,5 @@
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr ""
-"La valeur \"{0}\" pour la clé \"{1}\" ne fait pas partie des balises."
+msgstr "La valeur \"{0}\" pour la clé \"{1}\" ne fait pas partie des balises."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:572
@@ -20427,7 +20518,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 ""
 "Les sources (URL ou nom de fichier) du vérificateur orthographique (voir "
@@ -20530,9 +20620,9 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:103
 msgid "Unknown role"
-msgstr ""
+msgstr "Rôle inconnu"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:107
 msgid "Unknown member type"
-msgstr ""
+msgstr "Type du membre inconnu"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:113
@@ -20628,9 +20718,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 "zone"
@@ -20727,11 +20817,148 @@
 msgstr "{0}…"
 
-#: ../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
+#, fuzzy, java-format
+msgid "{0} {1}% of GPS track"
+msgstr "{0} est constitué de {1} trace"
+
+#: ../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 "Importer Audio"
+
+#: ../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 "Supprimer"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
+#, fuzzy
+msgid "removes current video from layer"
+msgstr "Supprimer la photo du calque"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
+#, fuzzy
+msgid "play/pause"
+msgstr "Lecture/Pause"
+
+#: ../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 "arrière-plan"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
+#, fuzzy
+msgid "jumps n sec back"
+msgstr "Aller en arrière"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "forward"
+msgstr "Avancer"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "jumps n sec forward"
+msgstr "Aller en avant"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
+#, fuzzy
+msgid "faster"
+msgstr "Accélérer"
+
+#: ../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 "Ralentir"
+
+#: ../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 "Permet d’ajouter des marqueurs/points sur les positions GPS."
+
+#. 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
+#, fuzzy
+msgid "Jump length"
+msgstr "Aller ici"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#, fuzzy
+msgid "Set the length of a jump"
+msgstr "Définissez la langue"
+
+#: ../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
+#, fuzzy
+msgid "Loop length"
+msgstr "Longueur"
+
+#: ../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
+#, fuzzy
+msgid "deinterlacing using linear interpolation"
+msgstr "filtre d’interpolation"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:99
+#, fuzzy
+msgid "play"
+msgstr "le calque"
+
+#: ../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 ""
 
@@ -20796,6 +21023,6 @@
 msgid "<html>Could not find a unique node to start downloading from.</html>"
 msgstr ""
-"<html>Impossible de trouver un unique nœud pour le début du "
-"téléchargement.</html>"
+"<html>Impossible de trouver un unique nœud pour le début du téléchargement.</"
+"html>"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:119
@@ -20823,8 +21050,8 @@
 msgstr ""
 "<html>il n’y a plus aucun chemin connecté à télécharger.<br>Cependant un "
-"nœud probablement dupliqué et correspondant au nœud sélectionné a été "
-"trouvé.<br>Le nœud sélectionné est ''{0}''<br>Le nœud probablement dupliqué "
-"est ''{1}''<br>Voulez-vous le fusionner  avec le nœud sélectionné et "
-"continuer le téléchargement des chemins ?</html>"
+"nœud probablement dupliqué et correspondant au nœud sélectionné a été trouvé."
+"<br>Le nœud sélectionné est ''{0}''<br>Le nœud probablement dupliqué est "
+"''{1}''<br>Voulez-vous le fusionner  avec le nœud sélectionné et continuer "
+"le téléchargement des chemins ?</html>"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:196
@@ -20944,6 +21171,6 @@
 "or a trailing '?'."
 msgstr ""
-"Attention : l’adresse du service WMS « {0} » ne se finit ni par « & », ni "
-"par « ? »."
+"Attention : l’adresse du service WMS « {0} » ne se finit ni par « & », ni par "
+"« ? »."
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
@@ -20969,9 +21196,9 @@
 "Cela peut amener à de mauvaises coordonnées."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
 msgid "Automatic downloading"
 msgstr "Téléchargement automatique"
 
-#: ../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}''"
@@ -20980,19 +21207,19 @@
 "« {0} »"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:105
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
 msgid "(deactivated)"
 msgstr "(désactivé)"
 
-#: ../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 "Calque WMS ({0}), téléchargement automatique au zoom {1}"
 
-#: ../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 "Calque WMS ({0}), téléchargement au zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
 #, java-format
 msgid ""
@@ -21006,17 +21233,17 @@
 "vos<br>préférences.<br>Voulez-vous récupérer des tuiles WMS ?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Yes, fetch images"
 msgstr "Oui, récupérer les images"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Invalid URL?"
 msgstr "URL invalide ?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311
 msgid "Download visible tiles"
 msgstr "Télécharger les tuiles visibles"
 
-#: ../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"
@@ -21024,33 +21251,33 @@
 "La zone demandée est trop grande. Prière de changer le zoom ou la résolution."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329
 msgid "Change resolution"
 msgstr "Changer la résolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341
 msgid "Reload erroneous tiles"
 msgstr "Recharger les tuiles erronées"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365
 msgid "Alpha channel"
 msgstr "Canal alpha"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385
 msgid "Save WMS layer to file"
 msgstr "Sauvegarder un calque WMS dans un fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
 msgid "Save WMS layer"
 msgstr "Sauvegarder le calque WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413
 msgid "Load WMS layer from file"
 msgstr "Charger un calque WMS depuis un fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
 msgid "Load WMS layer"
 msgstr "Charger le calque WMS"
 
-#: ../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}"
@@ -21059,63 +21286,63 @@
 "{1} attendue"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
 msgid "File Format Error"
 msgstr "Erreur de format de fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449
 msgid "Error loading file"
 msgstr "Erreur lors du chargement du fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463
 msgid "Set WMS Bookmark"
 msgstr "Placer un marque-page WMS"
 
-#: ../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 "Ouvrir un calque WMS vide pour charger des données depuis un fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
 msgid "WMS Plugin Preferences"
 msgstr "Préférences du greffon WMS"
 
-#: ../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 "Modifier la liste des serveurs WMS affichée dans le menu WMS."
 
-#: ../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 "Nom de la carte"
 
-#: ../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 "URL du service WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "Menu Name (Default)"
 msgstr "Nom de la carte (par défaut)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "WMS URL (Default)"
 msgstr "URL du service WMS (par défaut)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:86
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
 msgid "Enter a menu name and WMS URL"
 msgstr "Entrer un nom pour la carte et une URL pour le service WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:111
 msgid "Copy Selected Default(s)"
 msgstr "Copier le(s) réglage(s) par défaut sélectionné(s)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
 msgid "Please select at least one row to copy."
 msgstr "Veuillez sélectionner au moins une ligne à copier."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
 msgid "Downloader:"
 msgstr "Outil de téléchargement :"
@@ -21132,4 +21359,9 @@
 msgid "% of north:"
 msgstr "% du Nord :"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186
+#, fuzzy
+msgid "Simultaneous connections"
+msgstr "Noeud: connexion"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -21141,7 +21373,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
@@ -21195,8 +21427,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 "forêt"
@@ -21213,7 +21445,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--boundary tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -21223,5 +21455,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -21264,5 +21496,5 @@
 #. color boundary
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -21272,5 +21504,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -21280,5 +21512,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -21288,15 +21520,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 "frontière"
@@ -21312,5 +21544,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -21319,7 +21551,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--route tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -21329,5 +21561,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -21337,5 +21569,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -21345,5 +21577,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -21353,5 +21585,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -21361,5 +21593,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -21369,5 +21601,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -21377,12 +21609,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 "itinéraire"
@@ -21671,7 +21903,6 @@
 
 #. 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 ""
 "Télécharge les points GPS depuis un système d’enregistrement Globalsat DG100 "
@@ -21679,15 +21910,15 @@
 
 #. Plugin graphview
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:28
 msgid "Visualizes routing information as a routing graph."
 msgstr "Visualise les informations comme un calque de calcul d’itinéraire."
 
 #. Plugin grid
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:30
 msgid "Provide a background layer that displays a map grid"
 msgstr "Fournir un calque d’arrière plan en affichant une grille"
 
 #. 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 "
@@ -21700,10 +21931,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:34
 msgid "Helps vectorizing WMS images."
 msgstr "Aide à vectoriser des images WMS."
 
 #. 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."
@@ -21713,5 +21944,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 "
@@ -21724,5 +21955,5 @@
 
 #. 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 ""
@@ -21731,10 +21962,10 @@
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:42
 msgid "Simply convert an area to a multipolygon."
 msgstr "Convertir une aire en multipolygone"
 
 #. Plugin multipoly
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:44
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -21745,5 +21976,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 "
@@ -21755,15 +21986,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:48
 msgid "Displays an OpenLayers background image"
 msgstr "Affiche une image d’arrière plan provenant d’OpenLayers"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:50
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importe les erreurs d’OpenStreetBugs"
 
 #. 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"
@@ -21773,12 +22004,11 @@
 
 #. 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."
-msgstr ""
-"Ouvre Firefox pour afficher l’image à l’écran sous forme d’image SVG."
+msgstr "Ouvre Firefox pour afficher l’image à l’écran sous forme d’image SVG."
 
 #. 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 "
@@ -21789,5 +22019,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 "
@@ -21798,10 +22028,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Ajoute le thème JGoodies."
 
 #. 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."
@@ -21810,15 +22040,16 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "Let other applications send commands to JOSM."
 msgstr "Permet à d’autres applications d’envoyer des commandes vers JOSM."
 
 #. 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 "
@@ -21826,14 +22057,21 @@
 msgstr ""
 "Permet de faire un rendu des routes (bus, chemins de randonnées, pistes "
-"cyclables…). Les types de routes doivent être définis dans le fichier "
-"routes.xml, dans le dossier du greffon."
+"cyclables…). Les types de routes doivent être définis dans le fichier routes."
+"xml, dans le dossier du greffon."
 
 #. Plugin routing
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:71
 msgid "Provides routing capabilities."
 msgstr "Fournit des capacités de calcul d’itinéraire."
 
+#. 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 "
@@ -21844,15 +22082,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:77
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Permet d’ajouter des marqueurs/points sur les positions GPS."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:79
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Ouvre une fenêtre de modification des attributs sous forme de table."
 
 #. 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 "
@@ -21865,10 +22103,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:83
 msgid "Make terraced houses out of single blocks."
 msgstr "Créer des maisons mitoyennes depuis des blocs entiers."
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:85
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21877,5 +22115,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) "
@@ -21886,5 +22124,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:89
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21895,10 +22133,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:91
 msgid "Allows undeleting object from OSM database"
 msgstr "Authoriser la restauration de l'objet depuis la base de donnée OSM"
 
 #. 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 "
@@ -21909,5 +22147,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 "
@@ -21917,25 +22155,24 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:97
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
 "plugin is still under early development and may be buggy."
 msgstr ""
-"Permet le téléchargement de cartes scannées et tuilées depuis walking-"
-"papers.org. Ce greffon est encore en développement et peut contenir des bugs."
+"Permet le téléchargement de cartes scannées et tuilées depuis walking-papers."
+"org. Ce greffon est encore en développement et peut contenir des bugs."
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:99
 msgid "Easy downloading along a long set of interconnected ways"
-msgstr ""
-"Facilite le téléchargement le long de plusieurs chemins interconnectés"
+msgstr "Facilite le téléchargement le long de plusieurs chemins interconnectés"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:101
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Sélectionne une séquence de chemins connectés non-ramifiés"
 
 #. 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 "
@@ -21945,5 +22182,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:105
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22834,10 +23071,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 "rond-point"
@@ -22974,8 +23211,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"/>
@@ -23185,5 +23422,5 @@
 #. color motorroad
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -23193,5 +23430,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -23210,5 +23447,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -23218,5 +23455,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -23235,5 +23472,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -23243,5 +23480,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -23260,5 +23497,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -23268,5 +23505,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -23281,5 +23518,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -23297,8 +23534,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 "rue résidentiel"
@@ -23313,5 +23550,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -23320,5 +23557,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--public_transport tags -->
 #. <rule>
@@ -23328,10 +23565,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 "voie d’accès"
@@ -23346,5 +23583,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -23353,5 +23590,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -23361,10 +23598,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 "construction"
@@ -24370,9 +24607,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 "marais"
@@ -24702,5 +24939,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -24710,5 +24947,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -24718,5 +24955,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -24726,5 +24963,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -24734,5 +24971,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -24742,5 +24979,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -24750,5 +24987,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -24759,5 +24996,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -24765,9 +25002,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 "par rail"
@@ -26177,5 +26414,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -26185,5 +26422,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -26193,5 +26430,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -26201,5 +26438,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -26563,7 +26800,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--sport tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -26573,5 +26810,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -26581,5 +26818,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -26589,5 +26826,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -26597,5 +26834,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -26605,5 +26842,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -26613,5 +26850,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -26621,5 +26858,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -26629,5 +26866,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -26637,5 +26874,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -26645,5 +26882,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -26653,5 +26890,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -26661,5 +26898,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -26669,5 +26906,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -26677,5 +26914,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -26685,5 +26922,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -26693,5 +26930,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -26701,5 +26938,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -26709,5 +26946,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -26717,5 +26954,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -26725,5 +26962,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -26733,5 +26970,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -26741,5 +26978,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -26749,5 +26986,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -26757,5 +26994,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -26765,5 +27002,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -26773,5 +27010,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -26781,5 +27018,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -26789,5 +27026,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -26797,5 +27034,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -26805,5 +27042,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -26813,5 +27050,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -26821,5 +27058,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -26829,5 +27066,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -26837,5 +27074,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -26845,5 +27082,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -26853,5 +27090,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -26861,5 +27098,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -26869,5 +27106,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -26877,5 +27114,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -26885,5 +27122,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -26893,5 +27130,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -26901,5 +27138,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -26909,5 +27146,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -26917,5 +27154,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -26925,5 +27162,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -26933,33 +27170,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 "terrain de sport"
@@ -28638,7 +28875,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--landuse tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -28648,5 +28885,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -28656,5 +28893,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -28664,5 +28901,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -28672,5 +28909,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -28680,5 +28917,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -28688,5 +28925,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -28696,5 +28933,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -28704,12 +28941,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 "vert"
@@ -30125,5 +30362,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -30139,5 +30376,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -30147,18 +30384,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 -->
@@ -30167,7 +30421,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- cycleway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -30177,5 +30431,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -30185,5 +30439,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -30193,5 +30447,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -30201,12 +30455,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 "vélo"
@@ -30233,5 +30488,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -30247,5 +30502,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -30255,5 +30510,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -30262,13 +30517,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"/>
@@ -30279,13 +30542,14 @@
 #. <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 "voie piétonnière"
+msgstr "chemin pour piétons"
 
 #: build/trans_presets.java:3242
@@ -30302,8 +30566,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 "métro"
@@ -30415,9 +30679,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
@@ -30425,5 +30689,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,
@@ -30433,8 +30697,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
@@ -30448,5 +30712,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#. 
+#.
 #: build/trans_style.java:72
 msgid "standard"
@@ -30454,5 +30718,5 @@
 
 #. mappaint style named "standard"
-#. 
+#.
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -30501,6 +30765,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>
@@ -30580,5 +30844,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -30588,16 +30852,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 "déprécié"
@@ -30608,5 +30872,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -30615,5 +30879,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -30622,5 +30886,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -30636,5 +30900,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -30648,5 +30912,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -30655,5 +30919,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -30662,5 +30926,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -30669,5 +30933,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -30676,5 +30940,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -30683,5 +30947,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -30690,5 +30954,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxweight"/>
@@ -30697,5 +30961,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxheight"/>
@@ -30704,5 +30968,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -30711,5 +30975,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxlength"/>
@@ -30718,5 +30982,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -30725,5 +30989,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="minspeed"/>
@@ -30732,5 +30996,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxstay"/>
@@ -30739,5 +31003,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="toll"/>
@@ -30746,5 +31010,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="barrier"/>
@@ -30921,7 +31185,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- highway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -30935,5 +31199,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -30943,7 +31207,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- tracktype tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -30953,5 +31217,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -30961,5 +31225,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -30969,5 +31233,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -30977,10 +31241,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 "piste"
@@ -30991,5 +31255,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -30998,5 +31262,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -31006,5 +31270,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -31013,5 +31277,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -31020,5 +31284,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -31027,5 +31291,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -31034,5 +31298,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -31041,5 +31305,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -31048,5 +31312,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -31055,5 +31319,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -31062,5 +31326,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -31069,8 +31333,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 "aire de repos"
@@ -31081,8 +31345,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 "gué"
@@ -31093,5 +31357,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -31100,8 +31364,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 "rond-point interne"
@@ -31112,9 +31376,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 "point d’accès d’urgence"
@@ -31125,9 +31389,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 "lit d’un fleuve/d’une rivière"
@@ -31138,8 +31402,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 "ruisseau"
@@ -31150,8 +31414,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 "dock"
@@ -31162,5 +31426,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -31169,5 +31433,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -31176,5 +31440,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -31184,5 +31448,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -31191,5 +31455,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -31198,5 +31462,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -31205,5 +31469,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -31213,5 +31477,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -31222,5 +31486,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -31230,7 +31494,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--man_made tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -31240,5 +31504,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -31248,5 +31512,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -31256,5 +31520,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -31265,5 +31529,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -31272,5 +31536,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -31280,5 +31544,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -31288,5 +31552,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -31296,5 +31560,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -31304,5 +31568,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -31312,5 +31576,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -31320,5 +31584,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -31328,5 +31592,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -31336,5 +31600,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -31344,18 +31608,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 "artificiel"
@@ -31365,9 +31629,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 "rapides"
@@ -31378,7 +31642,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- railway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -31388,5 +31652,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -31395,5 +31659,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -31403,5 +31667,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -31410,5 +31674,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -31418,5 +31682,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -31426,10 +31690,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 "gare/arrêt ferroviaire"
@@ -31440,5 +31704,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -31449,13 +31713,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 "autre voie ferrée"
 
 #. color otherrail
-#: build/trans_style.java:1192
+#: build/trans_style.java:1217
 msgid "railover"
 msgstr "autre voie ferrée"
@@ -31466,5 +31730,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -31474,5 +31738,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -31485,5 +31749,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -31491,7 +31755,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 "ligne ferroviaire touristique"
@@ -31502,5 +31766,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -31509,5 +31773,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -31516,5 +31780,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -31523,7 +31787,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aeroway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -31534,9 +31798,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 "aéroport"
@@ -31547,8 +31811,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 "aérogare"
@@ -31559,5 +31823,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -31567,8 +31831,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 "héliport"
@@ -31579,8 +31843,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 "aire de stationnement pour avions"
@@ -31591,5 +31855,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -31598,5 +31862,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -31605,7 +31869,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aerialway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -31615,5 +31879,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -31623,5 +31887,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -31631,5 +31895,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -31639,5 +31903,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -31647,10 +31911,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 "transport aérien par câble"
@@ -31661,11 +31925,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 "piste de ski bleue"
@@ -31676,9 +31940,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 "piste de ski rouge"
@@ -31689,9 +31953,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 "piste de ski noire"
@@ -31702,9 +31966,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 "piste de ski orange"
@@ -31715,9 +31979,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 "piste de ski hors piste"
@@ -31728,9 +31992,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 "piste de ski verte"
@@ -31741,7 +32005,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--power tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -31751,5 +32015,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -31758,5 +32022,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -31766,5 +32030,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -31774,5 +32038,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -31782,5 +32046,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -31790,5 +32054,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -31798,5 +32062,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -31806,5 +32070,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -31814,5 +32078,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -31822,5 +32086,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -31830,5 +32094,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -31838,5 +32102,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -31846,15 +32110,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 "alimentation électrique"
@@ -31864,9 +32128,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 "jetée/ponton"
@@ -31877,8 +32141,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 "canalisation"
@@ -31888,7 +32152,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--leisure tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -31898,5 +32162,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -31906,5 +32170,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -31914,5 +32178,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -31922,5 +32186,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -31930,5 +32194,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -31938,5 +32202,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -31946,5 +32210,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -31954,5 +32218,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -31962,5 +32226,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -31970,5 +32234,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -31978,5 +32242,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -31986,5 +32250,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -31994,5 +32258,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -32002,5 +32266,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -32010,5 +32274,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -32018,17 +32282,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 "loisir"
@@ -32038,9 +32302,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 "port"
@@ -32050,7 +32314,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--amenity tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -32060,5 +32324,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -32068,5 +32332,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -32076,5 +32340,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -32084,5 +32348,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -32092,5 +32356,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -32100,5 +32364,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -32108,5 +32372,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -32116,5 +32380,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -32124,5 +32388,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -32132,14 +32396,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 "équipement"
@@ -32149,5 +32413,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -32157,5 +32421,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -32165,5 +32429,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -32173,5 +32437,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -32181,5 +32445,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -32189,5 +32453,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -32197,5 +32461,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -32205,5 +32469,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -32213,5 +32477,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -32221,5 +32485,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -32229,5 +32493,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -32237,14 +32501,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 "équipement de circulation"
@@ -32254,5 +32518,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -32261,5 +32525,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -32269,5 +32533,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -32276,5 +32540,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -32284,5 +32548,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -32292,5 +32556,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -32300,5 +32564,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -32307,5 +32571,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -32315,5 +32579,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -32323,5 +32587,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -32331,5 +32595,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -32339,5 +32603,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -32346,5 +32610,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -32353,5 +32617,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -32360,5 +32624,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -32367,5 +32631,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -32374,5 +32638,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -32381,5 +32645,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -32388,5 +32652,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -32395,5 +32659,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -32402,5 +32666,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -32409,5 +32673,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -32416,5 +32680,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -32423,5 +32687,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -32430,5 +32694,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -32438,5 +32702,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -32446,5 +32710,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -32454,5 +32718,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -32462,5 +32726,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -32470,5 +32734,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -32478,5 +32742,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -32486,5 +32750,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -32494,5 +32758,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -32502,5 +32766,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -32511,5 +32775,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -32519,5 +32783,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -32527,5 +32791,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -32535,5 +32799,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -32543,5 +32807,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -32551,5 +32815,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -32559,5 +32823,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -32567,5 +32831,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -32575,5 +32839,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -32583,5 +32847,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -32591,5 +32855,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -32599,5 +32863,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -32607,5 +32871,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -32615,5 +32879,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -32623,5 +32887,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -32631,5 +32895,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"/>
@@ -32639,5 +32911,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -32647,5 +32919,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -32655,5 +32927,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -32663,5 +32935,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -32670,27 +32942,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 "balise lumineuse"
@@ -32700,5 +32973,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -32708,5 +32981,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -32716,12 +32989,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 "fontaine/eau potable"
@@ -32731,5 +33004,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -32739,5 +33012,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -32747,5 +33020,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -32755,5 +33028,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -32763,5 +33036,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -32771,5 +33044,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -32779,11 +33052,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 "santé"
@@ -32793,7 +33066,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--shop tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -32803,5 +33076,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -32811,5 +33084,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -32819,5 +33092,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -32827,5 +33100,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -32835,5 +33108,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -32843,5 +33116,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -32851,5 +33124,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -32859,5 +33132,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -32867,5 +33140,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -32875,5 +33148,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -32883,5 +33156,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -32891,5 +33164,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -32899,5 +33172,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -32907,5 +33180,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -32915,5 +33188,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -32923,5 +33196,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -32931,5 +33204,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -32939,5 +33212,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -32947,5 +33220,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -32955,5 +33228,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -32963,5 +33236,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -32971,5 +33244,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -32979,5 +33252,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -32987,5 +33260,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -32995,5 +33268,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -33003,5 +33276,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -33011,5 +33284,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -33019,5 +33292,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -33027,5 +33300,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -33035,5 +33308,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -33043,5 +33316,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -33051,5 +33324,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -33059,5 +33332,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -33067,5 +33340,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -33075,5 +33348,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -33083,5 +33356,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -33091,5 +33364,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -33099,5 +33372,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -33107,5 +33380,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -33115,5 +33388,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -33123,5 +33396,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -33131,31 +33404,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 "magasin"
@@ -33165,7 +33438,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--tourism tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -33175,5 +33448,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -33183,5 +33456,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -33191,5 +33464,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -33199,5 +33472,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -33207,5 +33480,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -33215,5 +33488,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -33223,12 +33496,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 "hôtel"
@@ -33238,5 +33511,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -33246,5 +33519,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -33254,5 +33527,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -33262,5 +33535,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -33270,5 +33543,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -33278,5 +33551,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -33287,5 +33560,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -33295,5 +33568,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- information tags -->
 #. <rule>
@@ -33303,5 +33576,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -33311,5 +33584,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -33318,5 +33591,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -33325,13 +33598,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 "tourisme"
@@ -33341,7 +33614,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--historic tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -33351,5 +33624,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -33359,5 +33632,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -33367,5 +33640,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -33375,5 +33648,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -33383,5 +33656,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -33391,5 +33664,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -33399,5 +33672,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -33407,5 +33680,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -33415,13 +33688,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 "patrimoine"
@@ -33431,8 +33704,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 "carrière"
@@ -33443,8 +33716,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 "décharge"
@@ -33455,5 +33728,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -33463,8 +33736,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 "bassin"
@@ -33475,8 +33748,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 "cour de ferme"
@@ -33487,6 +33760,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
-#. 
+#.
+#.
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -33496,8 +33769,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 "commerce"
@@ -33508,8 +33781,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 "zone industrielle"
@@ -33520,8 +33793,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 "terrain vague"
@@ -33532,8 +33805,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 "zone d’aménagement"
@@ -33544,8 +33817,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 "zone ferroviaire"
@@ -33556,5 +33829,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -33564,7 +33837,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--military tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -33574,5 +33847,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -33582,5 +33855,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -33590,5 +33863,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -33598,11 +33871,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 "terrain militaire"
@@ -33613,8 +33886,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 "cimetière"
@@ -33624,8 +33897,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 "sommet"
@@ -33636,9 +33909,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 "glacier"
@@ -33648,9 +33921,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 "volcan"
@@ -33660,5 +33933,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -33669,5 +33942,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -33677,5 +33950,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -33685,5 +33958,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -33693,5 +33966,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -33701,12 +33974,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 "nature"
@@ -33716,9 +33989,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 "broussailles"
@@ -33728,9 +34001,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 "lande"
@@ -33740,9 +34013,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 "Zone forestière"
@@ -33752,9 +34025,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 "terrain boueux"
@@ -33764,9 +34037,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 "plage"
@@ -33777,5 +34050,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?
@@ -33801,5 +34074,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -33810,11 +34083,11 @@
 #. </rule>
 #. -->
-#. 
+#.
 #. <!--name tags -->
-#. 
+#.
 #. <!--preferences tags -->
-#. 
+#.
 #. <!--place tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -33824,5 +34097,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -33832,5 +34105,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -33840,5 +34113,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -33848,5 +34121,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -33856,5 +34129,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -33864,5 +34137,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -33872,5 +34145,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -33880,5 +34153,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -33888,5 +34161,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -33896,5 +34169,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -33904,5 +34177,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -33912,15 +34185,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 "lieu"
@@ -33930,9 +34203,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 "données TIGER"
@@ -34023,5 +34296,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#. 
+#.
 #. Data type can be:
 #. node        - a node point
@@ -34029,28 +34302,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
@@ -34113,5 +34386,5 @@
 #: build/trans_validator.java:59
 msgid "footway with tag foot"
-msgstr "voie piétonnière avec l’attribut « piéton (foot) »"
+msgstr "Chemin pour piétons avec l’attribut « piéton (foot) »"
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
@@ -34132,5 +34405,5 @@
 #: build/trans_validator.java:66 build/trans_validator.java:67
 msgid "maxspeed used for footway"
-msgstr "Limitation de vitesse utilisée pour une voie piétonnière"
+msgstr "Limitation de vitesse utilisée pour un chemin pour piétons"
 
 #. way  : I : highway == steps && maxspeed == *
@@ -34165,5 +34438,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#. 
+#.
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -34176,5 +34449,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>
@@ -34199,6 +34472,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#. 
-#. 
+#.
+#.
 #. only for Germany
 #: build/trans_wms.java:17
@@ -34207,6 +34480,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#. 
-#. 
+#.
+#.
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -34221,6 +34494,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
@@ -34234,6 +34507,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
@@ -34253,6 +34526,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#. 
-#. 
+#.
+#.
 #. only for Japan
 #: build/trans_wms.java:39
@@ -34276,6 +34549,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
@@ -34288,4 +34561,13 @@
 msgstr "Sicile - Italie"
 
+#~ 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 ""
+#~ "L’objet cible avec l’identifiant {0} et la version {1} est visible alors "
+#~ "que l’objet source avec la version {2} n’est pas visible. Impossible de "
+#~ "gérer cette incohérence. L’objet cible est gardé. "
+
 #~ msgid "Move"
 #~ msgstr "Déplacer"
@@ -34318,5 +34600,4 @@
 #~ msgstr "Supprimer le calque sélectionné."
 
-#, java-format
 #~ msgid "No time for point {0} x {1}"
 #~ msgstr "Aucune heure pour le point {0}·x·{1}"
@@ -34325,9 +34606,7 @@
 #~ msgstr "Aucune image avec des informations horaires lisibles trouvée."
 
-#, java-format
 #~ msgid "GPS start: {0}"
 #~ msgstr "Allumage du GPS : {0}"
 
-#, java-format
 #~ msgid "GPS end: {0}"
 #~ msgstr "Extinction du GPS : {0}"
@@ -34338,5 +34617,4 @@
 #~ msgstr[1] "images"
 
-#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} dans la trace."
@@ -34348,5 +34626,4 @@
 #~ msgstr "Au lieu de --download=<bbox> vous devriez indiquer osm://<bbox>\n"
 
-#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -34378,5 +34655,4 @@
 #~ msgstr "faux"
 
-#, java-format
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Résoudre {0} conflits dans {1} objets"
@@ -34388,5 +34664,4 @@
 #~ msgstr "sans-nom"
 
-#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Erreur durant le chargement de la page {0}"
@@ -34399,11 +34674,10 @@
 #~ "about the problem."
 #~ msgstr ""
-#~ "Le greffon ne peut pas être supprimé. Merci de le signaler là où vous avez "
-#~ "obtenu JOSM."
+#~ "Le greffon ne peut pas être supprimé. Merci de le signaler là où vous "
+#~ "avez obtenu JOSM."
 
 #~ msgid "Enter Password"
 #~ msgstr "Entrer le mot de passe"
 
-#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Greffon non trouvé : {0}"
@@ -34418,5 +34692,4 @@
 #~ msgstr "Impossible de se connecter au serveur."
 
-#, java-format
 #~ msgid "Images for {0}"
 #~ msgstr "Images pour {0}"
@@ -34453,6 +34726,6 @@
 #~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
 #~ msgstr ""
-#~ "<html>Je peux prendre un autre phot de mon GPS.<br>Cela peut-il aider "
-#~ "?</html>"
+#~ "<html>Je peux prendre un autre phot de mon GPS.<br>Cela peut-il aider ?</"
+#~ "html>"
 
 #~ msgid "Images with no exif position"
@@ -34465,5 +34738,4 @@
 #~ msgstr "Metacarta Map Rectifier image id"
 
-#, java-format
 #~ msgid "rectifier id={0}"
 #~ msgstr "rectifier id={0}"
@@ -34532,5 +34804,4 @@
 #~ msgstr "YAHOO (WebKit GTK)"
 
-#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "Ce greffon nécessite une mise à jour de JOSM : {0}."
@@ -34550,11 +34821,10 @@
 #~ msgid "Hint: Some changes came from uploading new data to the server."
 #~ msgstr ""
-#~ "Indication : Certains changements viennent de l’envoi de nouvelles données "
-#~ "sur le serveur."
+#~ "Indication : Certains changements viennent de l’envoi de nouvelles "
+#~ "données sur le serveur."
 
 #~ msgid "Tags (empty value deletes tag)"
 #~ msgstr "Étiquettes (une valeur vide supprime l’étiquette)"
 
-#, java-format
 #~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
 #~ msgstr "Impossible de lire l’heure \"{0}\" du point {1} x {2}"
@@ -34563,5 +34833,4 @@
 #~ msgstr "Synchroniser l’horloge"
 
-#, java-format
 #~ msgid "There is no EXIF time within the file \"{0}\"."
 #~ msgstr "Il n’y a aucune heure EXIF associée au fichier \"{0}\"."
@@ -34573,18 +34842,19 @@
 #~ "Login password to the OSM account. Leave blank to not store any password."
 #~ msgstr ""
-#~ "Mot de passe d’identification au compte OSM. Laisser blanc pour ne stocker "
-#~ "aucun mot de passe."
+#~ "Mot de passe d’identification au compte OSM. Laisser blanc pour ne "
+#~ "stocker aucun mot de passe."
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you load\n"
+#~ "Parameters are read in the order they are specified, so make sure you "
+#~ "load\n"
 #~ "some data before --selection"
 #~ msgstr ""
-#~ "Les paramètres sont lus dans l’ordre dans lequel ils sont spécifiés, soyez "
-#~ "donc\n"
+#~ "Les paramètres sont lus dans l’ordre dans lequel ils sont spécifiés, "
+#~ "soyez donc\n"
 #~ "sur d’avoir chargé des données avant --selection"
 
 #~ 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 ""
 #~ "L’activation des greffons mis à jour a échoué. Vérifiez si JOSM a "
@@ -34596,9 +34866,10 @@
 #~ msgid "Can only edit help pages from JOSM Online Help"
 #~ msgstr ""
-#~ "Les pages d’aide ne peuvent être éditées que depuis l’aide en ligne de JOSM"
+#~ "Les pages d’aide ne peuvent être éditées que depuis l’aide en ligne de "
+#~ "JOSM"
 
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want to "
-#~ "combine them?"
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
 #~ msgstr ""
 #~ "Les chemins sélectionnés ne sont pas les mêmes membres d’une relation. "
@@ -34624,5 +34895,4 @@
 #~ msgstr "Lecture GPX..."
 
-#, java-format
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
 #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
@@ -34639,5 +34909,4 @@
 #~ msgstr "Mise à jour des greffons"
 
-#, java-format
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Impossible de télécharger le greffon : {0} de {1}"
@@ -34657,6 +34926,6 @@
 #~ msgstr ""
 #~ "(Vous pouvez changer le nombre de jours au bout duquel cet avertissement "
-#~ "s'affiche<br>en modifiant l'option de configuration "
-#~ "'pluginmanager.warntime'.)"
+#~ "s'affiche<br>en modifiant l'option de configuration 'pluginmanager."
+#~ "warntime'.)"
 
 #~ msgid "Be sure to include the following information:"
@@ -34666,5 +34935,4 @@
 #~ msgstr "Erreur d'analyse de la réponse du serveur"
 
-#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -34750,6 +35018,6 @@
 #~ msgid "Include your steps to get to the error (as detailed as possible)!"
 #~ msgstr ""
-#~ "Indiquer la procédure effectuée pour arriver à cette erreur (aussi détaillée "
-#~ "que possible) !"
+#~ "Indiquer la procédure effectuée pour arriver à cette erreur (aussi "
+#~ "détaillée que possible) !"
 
 #~ msgid "Server does not support changesets"
@@ -34766,15 +35034,13 @@
 
 #~ 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 ""
-#~ "Essayez d'utiliser la dernière version de JOSM et de ses greffons avant de "
-#~ "rapporter un bogue."
-
-#, java-format
+#~ "Essayez d'utiliser la dernière version de JOSM et de ses greffons avant "
+#~ "de rapporter un bogue."
+
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "Impossible de lire quelque chose depuis l’URL : \"{0}\""
 
-#, java-format
 #~ msgid "Parsing error in URL: \"{0}\""
 #~ msgstr "Erreur d’analyse dans l’URL : \"{0}\""
@@ -34784,6 +35050,6 @@
 
 #~ msgid ""
-#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
-#~ "these will then show up in the WMS menu.\n"
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
 #~ "\n"
 #~ "You can also do this manually in the Advanced Preferences, using the "
@@ -34800,6 +35066,6 @@
 #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
 #~ "only need to input the relevant 'id'.\n"
-#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in "
-#~ "this example,replacing 73 with your image id: \n"
+#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
+#~ "in this example,replacing 73 with your image id: \n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -34809,8 +35075,9 @@
 #~ msgstr ""
 #~ "Vous pouvez ajouter, éditer et supprimer des sources WMS dans l'onglet "
-#~ "Préférences du greffon WMS - elles apparaitront ensuite dans le menu WMS.\n"
+#~ "Préférences du greffon WMS - elles apparaitront ensuite dans le menu "
+#~ "WMS.\n"
 #~ "\n"
-#~ "Vous pouvez également faire cela manuellement dans les Préférences avancées, "
-#~ "en utilisant le schéma suivant :\n"
+#~ "Vous pouvez également faire cela manuellement dans les Préférences "
+#~ "avancées, en utilisant le schéma suivant :\n"
 #~ "wmsplugin.url.1.name=Landsat\n"
 #~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
@@ -34847,9 +35114,9 @@
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still want "
-#~ "to merge them?"
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
 #~ msgstr ""
-#~ "Les nœuds sélectionnés ne sont pas les mêmes membres d’une relation. Voulez-"
-#~ "vous encore les fusionner ?"
+#~ "Les nœuds sélectionnés ne sont pas les mêmes membres d’une relation. "
+#~ "Voulez-vous encore les fusionner ?"
 
 #~ msgid "Only two nodes allowed"
@@ -34863,5 +35130,4 @@
 #~ "Fusionner des nœuds qui ne sont pas les mêmes membres d’une relation ?"
 
-#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Impossible d’ouvrir le répertoire des préférences : {0}"
@@ -34870,25 +35136,19 @@
 #~ msgstr "Membre vide dans la relation."
 
-#, java-format
 #~ msgid "multipolygon way ''{0}'' is not closed."
 #~ msgstr "Le multipolygone \"{0}\" n'est pas fermé."
 
-#, java-format
 #~ msgid "Way ''{0}'' with less than two points."
 #~ msgstr "Chemin \"{0}\" comporte moins de deux points."
 
-#, java-format
 #~ msgid "Non-Way ''{0}'' in multipolygon."
 #~ msgstr "Non-chemin \"{0}\" dans le multipolygone."
 
-#, java-format
 #~ msgid "Intersection between ways ''{0}'' and ''{1}''."
 #~ msgstr "Intersection entre les chemins \"{0}\" et \"{1}\"."
 
-#, java-format
 #~ msgid "Warning: {0}"
 #~ msgstr "Attention : {0}"
 
-#, java-format
 #~ msgid "Error: {0}"
 #~ msgstr "Erreur : {0}"
@@ -34919,13 +35179,10 @@
 #~ msgstr "Afficher la liste des auteurs"
 
-#, java-format
 #~ msgid "No outer way for multipolygon ''{0}''."
 #~ msgstr "Pas de chemin extérieur pour le multipolygone \"{0}\"."
 
-#, java-format
 #~ msgid "Inner way ''{0}'' is outside."
 #~ msgstr "Le chemin intérieur \"{0}\" est à l'extérieur."
 
-#, java-format
 #~ msgid "No useful role ''{0}'' for Way ''{1}''."
 #~ msgstr "Pas de rôle utile \"{0}\" pour le chemin \"{1}\"."
@@ -34937,12 +35194,11 @@
 #~ msgstr "Vérifier les notes de rendu."
 
-#, 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 ""
 #~ "Le greffon {0} semble endommagé ou n'a pas pu être téléchargé "
 #~ "automatiquement."
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -34961,5 +35217,4 @@
 #~ msgstr "Chargement vers OSM..."
 
-#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -34968,6 +35223,6 @@
 #~ "{0}"
 #~ msgstr ""
-#~ "L'archive du greffon a déjà été téléchargée. Souhiatez-vous télécharger la "
-#~ "version actuelle en supprimant l'archive existante?\n"
+#~ "L'archive du greffon a déjà été téléchargée. Souhiatez-vous télécharger "
+#~ "la version actuelle en supprimant l'archive existante?\n"
 #~ "\n"
 #~ "{0}"
@@ -34976,5 +35231,4 @@
 #~ msgstr "Vérifier si le rendu de carte a généré des erreurs."
 
-#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "Auteurs : {0}"
@@ -34996,5 +35250,4 @@
 #~ msgstr "Ouvrir dans le navigateur"
 
-#, java-format
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr "Chemin ignoré car il contient un nœud inexistant : {0}\n"
@@ -35005,9 +35258,7 @@
 #~ "nœuds."
 
-#, java-format
 #~ msgid "Unknown role ''{0}''."
 #~ msgstr "Rôle inconnu \"{0}\"."
 
-#, java-format
 #~ msgid "Unknown member type for ''{0}''."
 #~ msgstr "Type de membre inconnu pour \"{0}\"."
@@ -35027,6 +35278,6 @@
 #~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
 #~ msgstr ""
-#~ "Sélectionner manuellement la zone Lambert (i.e. pour les localisations entre "
-#~ "deux zones)"
+#~ "Sélectionner manuellement la zone Lambert (i.e. pour les localisations "
+#~ "entre deux zones)"
 
 #~ msgid "Select Tableau d'Assemblage"
@@ -35042,8 +35293,9 @@
 #~ msgstr "Ajouter le commentaire de source suivant :"
 
-#, java-format
-#~ msgid "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
+#~ msgid ""
+#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
 #~ msgstr ""
-#~ "Zine Lambert {0} du tampon incompatible avec la zone de Lambert courante {1}"
+#~ "Zine Lambert {0} du tampon incompatible avec la zone de Lambert courante "
+#~ "{1}"
 
 #~ msgid ""
@@ -35051,6 +35303,6 @@
 #~ "some time."
 #~ msgstr ""
-#~ "Le serveur a retourné une erreur. Essayez de réduire la taille de la zone à "
-#~ "charger, et/ou attendez un peu avant de recommencer."
+#~ "Le serveur a retourné une erreur. Essayez de réduire la taille de la zone "
+#~ "à charger, et/ou attendez un peu avant de recommencer."
 
 #~ msgid "Remove Selected"
@@ -35077,5 +35329,4 @@
 #~ msgstr "Continuer tout de même"
 
-#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Veuillez rapporter un billet à {0}"
@@ -35112,6 +35363,6 @@
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version selected "
-#~ "in the history list."
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
 #~ msgstr ""
 #~ "Rétablir l’état des objets actuellement sélectionnés à la version "
@@ -35121,5 +35372,4 @@
 #~ msgstr "Supprimer le calque"
 
-#, java-format
 #~ msgid "Layers: {0}"
 #~ msgstr "Calques: {0}"
@@ -35131,9 +35381,7 @@
 #~ msgstr "Fusionner les conflits."
 
-#, java-format
 #~ msgid "current delta: {0}s"
 #~ msgstr "variation différentielle actuelle : {0}s"
 
-#, java-format
 #~ msgid "The date in file \"{0}\" could not be parsed."
 #~ msgstr "La date du fichier \"{0}\" n'a pas pu être analysée."
@@ -35180,6 +35428,6 @@
 
 #~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this as "
-#~ "a bug."
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
 #~ msgstr ""
 #~ "Erreur interne : impossible de vérifier les conditions pour aucun calque. "
@@ -35198,5 +35446,4 @@
 #~ msgstr "Déplacer vers le bas"
 
-#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Editeur de relation : {0}"
@@ -35205,5 +35452,4 @@
 #~ msgstr "Déplacer vers le haut"
 
-#, java-format
 #~ msgid "Change the projection to {0} first."
 #~ msgstr "Changez auparavant la projection en {0}"
@@ -35212,5 +35458,4 @@
 #~ msgstr "Projection invalide"
 
-#, java-format
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
@@ -35227,9 +35472,7 @@
 #~ "éléments déjà chargés ont un historique."
 
-#, java-format
 #~ msgid "Found {0} matches of {1} in GPX track {2}"
 #~ msgstr "Trouvé {0} correspondances sur {1} dans la trace GPX {2}"
 
-#, java-format
 #~ msgid "Offset between track and photos: {0}m {1}s"
 #~ msgstr "Différence entre la trace et les photos : {0}min. {1}sec."
@@ -35239,9 +35482,9 @@
 
 #~ msgid ""
-#~ "An error occured while trying to match the photos to the GPX track. You can "
-#~ "adjust the sliders to manually match the photos."
+#~ "An error occured while trying to match the photos to the GPX track. You "
+#~ "can adjust the sliders to manually match the photos."
 #~ msgstr ""
-#~ "Une erreur est survenue lors de l'association des photos avec la trace GPX. "
-#~ "Vous pouvez ajuster les curseurs pour faire correspondre les photos "
+#~ "Une erreur est survenue lors de l'association des photos avec la trace "
+#~ "GPX. Vous pouvez ajuster les curseurs pour faire correspondre les photos "
 #~ "manuellement."
 
@@ -35286,9 +35529,7 @@
 #~ msgstr "Modifier une herse"
 
-#, java-format
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "Utiliser la balise \"{0}\" du groupe \"{1}\""
 
-#, java-format
 #~ msgid "Use preset ''{0}''"
 #~ msgstr "Utiliser la balise \"{0}\""
@@ -35304,7 +35545,7 @@
 #~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
 #~ msgstr ""
-#~ "Les sources (URL ou nom de fichier) des fichiers de définitions des balises "
-#~ "prédéfinies. Voir http://josm.openstreetmap.de/wiki/TaggingPresets pour plus "
-#~ "d'informations"
+#~ "Les sources (URL ou nom de fichier) des fichiers de définitions des "
+#~ "balises prédéfinies. Voir http://josm.openstreetmap.de/wiki/"
+#~ "TaggingPresets pour plus d'informations"
 
 #~ msgid "Add a new tagging preset source to the list."
@@ -35319,14 +35560,14 @@
 
 #~ msgid ""
-#~ "Tools to work with authors/users. Selects map data that belongs to selected "
-#~ "user, opens browser showing selected author profile page."
+#~ "Tools to work with authors/users. Selects map data that belongs to "
+#~ "selected user, opens browser showing selected author profile page."
 #~ msgstr ""
-#~ "Outil pour travailler avec les auteurs/utilisateurs. Sélectionnez une donnée "
-#~ "de l'utilisateur sur la carte pour ouvrir un navigateur affichant la page du "
-#~ "profil de l'auteur."
+#~ "Outil pour travailler avec les auteurs/utilisateurs. Sélectionnez une "
+#~ "donnée de l'utilisateur sur la carte pour ouvrir un navigateur affichant "
+#~ "la page du profil de l'auteur."
 
 #~ msgid ""
-#~ "Several utilities that make your life easier: e.g. simplify way, join areas, "
-#~ "jump to position."
+#~ "Several utilities that make your life easier: e.g. simplify way, join "
+#~ "areas, jump to position."
 #~ msgstr ""
 #~ "Quelques utilitaires qui vous rendent la vie plus facile : par ex. "
@@ -35338,11 +35579,11 @@
 #~ msgid ""
 #~ "The main feature of the plugin is the possibility to delete points of the "
-#~ "GPX track. This plugin can be used to prepare  tracks for uploading to OSM "
-#~ "eg. deleting uninteresting parts of track."
+#~ "GPX track. This plugin can be used to prepare  tracks for uploading to "
+#~ "OSM eg. deleting uninteresting parts of track."
 #~ msgstr ""
-#~ "La principale fonction du greffon est de permettre la suppression de points "
-#~ "de la trace GPX. Ce greffon peut être utilisé pour préparer des traces à "
-#~ "être chargées vers OSM, par ex. en supprimant des parties inintéressantes "
-#~ "des traces."
+#~ "La principale fonction du greffon est de permettre la suppression de "
+#~ "points de la trace GPX. Ce greffon peut être utilisé pour préparer des "
+#~ "traces à être chargées vers OSM, par ex. en supprimant des parties "
+#~ "inintéressantes des traces."
 
 #~ msgid "All the ways were empty"
@@ -35364,5 +35605,4 @@
 #~ msgstr "Erreur lors du traitement de la réponse au changement envoyé"
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -35376,5 +35616,6 @@
 #~ "les latitudes entre 45.7° et 47.9°\n"
 #~ "et les longitutes entre 5.7° et 10.6° uniquement.\n"
-#~ "Veuillez utiliser un autre système de projection si vous ne travaillez pas\n"
+#~ "Veuillez utiliser un autre système de projection si vous ne travaillez "
+#~ "pas\n"
 #~ "sur des données de Suisse ou du Liechtenstein.\n"
 #~ "Ne pas envoyer de données après ce message."
@@ -35392,18 +35633,15 @@
 #~ msgstr "% de lon. :"
 
-#, java-format
 #~ msgid "Image with path {0} does not exist or is not readable."
 #~ msgstr "L’image dont le chemin est {0} n'existe pas ou est illisible."
 
-#, java-format
 #~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
 #~ msgstr ""
-#~ "Donnée invalide de l’attribut \"type\" sur le membre {0} de la relation {1}, "
-#~ "valeur {2}"
+#~ "Donnée invalide de l’attribut \"type\" sur le membre {0} de la relation "
+#~ "{1}, valeur {2}"
 
 #~ msgid "Wrong number of parameters for nodes operator."
 #~ msgstr "Erreur de nombre de paramètre pour une opération sur des nœuds."
 
-#, java-format
 #~ msgid ""
 #~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
@@ -35411,14 +35649,13 @@
 #~ msgstr ""
 #~ "Valeur incorrecte lors de l’opération sur les nœuds : {0}. Les opérations "
-#~ "sur les nœuds requièrent des nombres ou des plages de nombres, par exemple : "
-#~ "10-20"
-
-#, java-format
+#~ "sur les nœuds requièrent des nombres ou des plages de nombres, par "
+#~ "exemple : 10-20"
+
 #~ msgid "Resolve conflicts in member list of of relation {0}"
 #~ msgstr "Résoudre les conflits dans la liste des membres de la relation {0}"
 
-#, java-format
 #~ msgid "Incorrect value of id operator: {0}. Number is expected."
-#~ msgstr "Valeur inorrecte de l’opération sur id : {0}. Un nombre est attendu."
+#~ msgstr ""
+#~ "Valeur inorrecte de l’opération sur id : {0}. Un nombre est attendu."
 
 #~ msgid ""
@@ -35448,9 +35685,8 @@
 #~ msgstr "Sélectionner le nœud de départ à la fin d'un chemin"
 
-#, java-format
 #~ msgid "Plugin {0} requires JOSM update to version {1}."
-#~ msgstr "Le greffon {0} nécessite la mise à jour de JOSM vers la version {1}."
-
-#, java-format
+#~ msgstr ""
+#~ "Le greffon {0} nécessite la mise à jour de JOSM vers la version {1}."
+
 #~ msgid "Checking whether node {0} is gone ..."
 #~ msgstr "Vérification si le nœud {0} est supprimé..."
@@ -35462,30 +35698,30 @@
 #~ msgstr "Restauration du chemin..."
 
-#, java-format
 #~ msgid "Checking whether primitive {0} is gone ..."
 #~ msgstr "Vérification si la primitive {0} est supprimée..."
 
-#, java-format
 #~ msgid ""
-#~ "<html>The OSM primitive with id <strong>{0}</strong> has been deleted<br>on "
-#~ "the server by another mapper.<br><br>Click <strong>{1}</strong> to keep your "
-#~ "primitive and ignore the deleted state.<br>Your primitive will be assigend a "
-#~ "new id.<br>Click <strong>{2}</strong> to accept the state on the server and "
-#~ "to delete your primitive.<br>Click <strong>{3}</strong> to cancel.<br>"
+#~ "<html>The OSM primitive with id <strong>{0}</strong> has been "
+#~ "deleted<br>on the server by another mapper.<br><br>Click <strong>{1}</"
+#~ "strong> to keep your primitive and ignore the deleted state.<br>Your "
+#~ "primitive will be assigend a new id.<br>Click <strong>{2}</strong> to "
+#~ "accept the state on the server and to delete your primitive.<br>Click "
+#~ "<strong>{3}</strong> to cancel.<br>"
 #~ msgstr ""
-#~ "<html>La primitive OSM d’id <strong>{0}</strong> a été supprimée<br>sur le "
-#~ "serveur par un autre utilisateur.<br><br>Cliquez <strong>{1}</strong> pour "
-#~ "garder votre primitive et ignorer l’état supprimé.<br>Votre primitive "
-#~ "obtiendra un nouvel id.<br>Cliquez <strong>{2}</strong> pour accepter l’état "
-#~ "du serveur et supprimer votre primitive.<br>Cliquez <strong>{3}</strong> "
-#~ "pour annuler.<br>"
-
-#, java-format
+#~ "<html>La primitive OSM d’id <strong>{0}</strong> a été supprimée<br>sur "
+#~ "le serveur par un autre utilisateur.<br><br>Cliquez <strong>{1}</strong> "
+#~ "pour garder votre primitive et ignorer l’état supprimé.<br>Votre "
+#~ "primitive obtiendra un nouvel id.<br>Cliquez <strong>{2}</strong> pour "
+#~ "accepter l’état du serveur et supprimer votre primitive.<br>Cliquez "
+#~ "<strong>{3}</strong> pour annuler.<br>"
+
 #~ msgid ""
-#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for individual "
-#~ "update. Please reduce the selection<br>to max. {1} primitives.</html>"
+#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
+#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
+#~ "</html>"
 #~ msgstr ""
-#~ "<html>Il y a <strong>{0}</strong> primitives <br>sélectionnées pour mise à "
-#~ "jour. Veuillez réduire la sélection<br>à un maximum de {1} primitives.</html>"
+#~ "<html>Il y a <strong>{0}</strong> primitives <br>sélectionnées pour mise "
+#~ "à jour. Veuillez réduire la sélection<br>à un maximum de {1} primitives.</"
+#~ "html>"
 
 #~ msgid "Selection too big"
@@ -35531,5 +35767,4 @@
 #~ msgstr "Suppression d’une primitive"
 
-#, java-format
 #~ msgid ""
 #~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
@@ -35555,6 +35790,6 @@
 
 #~ msgid ""
-#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
-#~ "these will then show up in the WMS menu.\n"
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
 #~ "\n"
 #~ "You can also do this manually in the Advanced Preferences, using the "
@@ -35570,6 +35805,6 @@
 #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
 #~ "only need to input the relevant 'id'.\n"
-#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in "
-#~ "this example, replacing 73 with your image id:\n"
+#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
+#~ "in this example, replacing 73 with your image id:\n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -35578,6 +35813,7 @@
 #~ "use."
 #~ msgstr ""
-#~ "Vous pouvez ajouter, éditer et supprimer des entrées WMS dans l’onglet des "
-#~ "préférences de WMSplugin - ces options s’afficheront dans le menu WMS.\n"
+#~ "Vous pouvez ajouter, éditer et supprimer des entrées WMS dans l’onglet "
+#~ "des préférences de WMSplugin - ces options s’afficheront dans le menu "
+#~ "WMS.\n"
 #~ "\n"
 #~ "Vous pouvez également effectuer ceci dans les Préférences Avancées, en "
@@ -35591,7 +35827,6 @@
 #~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
 #~ "\n"
-#~ "Pour le Rectificateur de Carte Metacarta "
-#~ "http://labs.metacarta.com/rectifier/ , vous avez seulement besoin d’entrer "
-#~ "le bon ’id’.\n"
+#~ "Pour le Rectificateur de Carte Metacarta http://labs.metacarta.com/"
+#~ "rectifier/ , vous avez seulement besoin d’entrer le bon ’id’.\n"
 #~ "Pour ajouter l'entrée de menu du Rectificateur de Carte Metacarta, créez "
 #~ "manuellement l'URL comme dans cet exemple, en remplaçant 73 par l’id de "
@@ -35600,29 +35835,27 @@
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
 #~ "\n"
-#~ "Note : veuillez vous assurer que l'image est utilisable, notamment au niveau "
-#~ "du copyright, dans le doute, ne l'utilisez pas."
-
-#, java-format
+#~ "Note : veuillez vous assurer que l'image est utilisable, notamment au "
+#~ "niveau du copyright, dans le doute, ne l'utilisez pas."
+
 #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 #~ msgstr "Erreur : l’en-tête \"{0}\" ne correspond pas au modèle \"{1}\""
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data layer?"
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
 #~ msgstr ""
 #~ "Aucune donnée à mettre à jour trouvée. Avez-vous ouvert ou téléchargé une "
 #~ "couche de données ?"
 
-#, java-format
 #~ msgid ""
 #~ "Current number of changes exceeds the max. number of changes, current is "
 #~ "{0}, max is {1}"
 #~ msgstr ""
-#~ "Le nombre actuel de changements dépasse le maximum autorisé. Nombre courant "
-#~ ": {0}, maximum : {1}"
+#~ "Le nombre actuel de changements dépasse le maximum autorisé. Nombre "
+#~ "courant : {0}, maximum : {1}"
 
 #~ msgid "Failed to initialize API. Please try again later."
 #~ msgstr "Impossible d'initialiser l’API. Veuillez réessayer plus tard."
 
-#, java-format
 #~ msgid "removing reference from way {0}"
 #~ msgstr "suppression de la référence du chemin {0}"
@@ -35651,5 +35884,4 @@
 #~ msgstr "Ajouter une nouvelle source XML à la liste"
 
-#, java-format
 #~ msgid "Plug-in named {0} is not available. Update skipped."
 #~ msgstr "Le plugin {0} n'est pas disponible. Mise à jour annulée."
@@ -35659,6 +35891,6 @@
 
 #~ msgid ""
-#~ "Enable to upload all changes in one request, disable to use one request per "
-#~ "changed primitive"
+#~ "Enable to upload all changes in one request, disable to use one request "
+#~ "per changed primitive"
 #~ msgstr ""
 #~ "Permettre l'envoi de tous les changements en une requête, désactivez pour "
@@ -35679,5 +35911,6 @@
 #~ msgid "The plugin could not be removed. Probably it was already disabled"
 #~ msgstr ""
-#~ "Le greffon ne peut pas être supprimé. Il était probablement déjà désactivé."
+#~ "Le greffon ne peut pas être supprimé. Il était probablement déjà "
+#~ "désactivé."
 
 #~ msgid ""
@@ -35685,8 +35918,7 @@
 #~ "found."
 #~ msgstr ""
-#~ "Version inattendue de JOSM. Ni Main.ds ni Main.getCurrentDataSet() ont été "
-#~ "trouvés."
-
-#, java-format
+#~ "Version inattendue de JOSM. Ni Main.ds ni Main.getCurrentDataSet() ont "
+#~ "été trouvés."
+
 #~ msgid ""
 #~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
@@ -35709,56 +35941,50 @@
 #~ msgstr "Vélos"
 
-#, java-format
 #~ msgid ""
 #~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
 #~ "relation?</html>"
 #~ msgstr ""
-#~ "<html>La sélection \"{0}\" est utilisée par la relation \"{1}\".<br>Enlever "
-#~ "de la relation ?</html>"
-
-#, java-format
+#~ "<html>La sélection \"{0}\" est utilisée par la relation \"{1}\"."
+#~ "<br>Enlever de la relation ?</html>"
+
 #~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-#~ "from relation?</html>"
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
 #~ msgstr ""
-#~ "<html>La sélection \"{0}\" est utilisée par la relation \"{1}\" avec le rôle "
-#~ "{2}.<br>Enlever de la relation ?</html>"
+#~ "<html>La sélection \"{0}\" est utilisée par la relation \"{1}\" avec le "
+#~ "rôle {2}.<br>Enlever de la relation ?</html>"
 
 #~ msgid ""
-#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
-#~ "the following\n"
+#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to "
+#~ "add the following\n"
 #~ "      Java option to increase the maximum size of allocated memory"
 #~ msgstr ""
-#~ "note : pour certaines tâches, JOSM requiert beaucoup de mémoire. Il est peut-"
-#~ "être nécessaire d'ajouter l'option Java \n"
+#~ "note : pour certaines tâches, JOSM requiert beaucoup de mémoire. Il est "
+#~ "peut-être nécessaire d'ajouter l'option Java \n"
 #~ "      pour augmenter la taille maximale de mémoire allouée"
 
-#, java-format
 #~ msgid ""
 #~ "Select to upload to the existing changeset {0} and to leave the changeset "
 #~ "open for further uploads"
 #~ msgstr ""
-#~ "Envoyer avec la session de modification existante {0} et la laisser ouverte "
-#~ "pour d'autres envois."
-
-#, java-format
+#~ "Envoyer avec la session de modification existante {0} et la laisser "
+#~ "ouverte pour d'autres envois."
+
 #~ msgid "Use the existing changeset {0} and close it after upload"
 #~ msgstr ""
-#~ "Utiliser la session de modification existante {0} et la fermer après l'envoi."
-
-#, java-format
+#~ "Utiliser la session de modification existante {0} et la fermer après "
+#~ "l'envoi."
+
 #~ msgid ""
 #~ "Select to upload to the existing changeset {0} and to close the changeset "
 #~ "after this upload"
 #~ msgstr ""
-#~ "Envoyer avec la session de modification existante {0} et la fermer après cet "
-#~ "envoi."
-
-#, java-format
+#~ "Envoyer avec la session de modification existante {0} et la fermer après "
+#~ "cet envoi."
+
 #~ msgid "Use the existing changeset {0} and leave it open"
 #~ msgstr ""
 #~ "Utiliser la session de modification existante {0} et la conserver ouverte."
 
-#, java-format
 #~ msgid "paramete''{0}'' must not be null"
 #~ msgstr "Le paramètre \"{0}\" ne doit pas être nul."
@@ -35773,12 +35999,10 @@
 #~ msgstr "<html>"
 
-#, java-format
 #~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr "Page d’aide manquante. Créez-la en <A HREF=\"{0}\">français</A>."
 
-#, java-format
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
 #~ msgstr ""
 #~ "Page d’aide manquante. Créez-la en <A HREF=\"{0}\">français</A> ou <A "
@@ -35792,11 +36016,10 @@
 
 #~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
 #~ msgstr ""
 #~ "Page d’aide manquante. Créez la sur <A HREF=\"{0}\">English</A> ou <A "
 #~ "HREF=\"{1}\">French</A>."
 
-#, java-format
 #~ msgid ""
 #~ "WARNING: launching browser windows for the first {0} of {1} selected "
@@ -35806,17 +36029,13 @@
 #~ "primitives sélectionnées uniquement."
 
-#, java-format
 #~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 #~ msgstr "Instance de OsmDataLayer ou GpxLayer attendue. \"{0}\" trouvé."
 
-#, java-format
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "valeur inattendue retournée. Reçue {0}"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
 #~ msgstr "Paramètre \"{0}\" > 0 attendu, reçu \"{1}\"."
 
-#, java-format
 #~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 #~ msgstr "le paramètre \"{0}\" n’est pas une classe acceptable, reçu \"{1}"
@@ -35829,5 +36048,4 @@
 #~ "Il n’y a pas de version valide à la date du \"{0}\" dans cet historique"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 #~ msgstr "paramètre \"{0}\" compris entre 0 et {1} attendu, reçu {2}"
@@ -35839,21 +36057,16 @@
 #~ msgstr "pas de version plus récente trouvée. L’historique est vide."
 
-#, java-format
 #~ msgid "Parameter current out of range. Got {0}."
 #~ msgstr "paramètre en dehors de la plage : reçu {0}"
 
-#, java-format
 #~ msgid "Unexpected column index. Got {0}."
 #~ msgstr "index de colonne inattendu. Reçu {0}"
 
-#, java-format
 #~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
 #~ msgstr "Le paramètre 'col' doit être 0 ou 1. Reçu {0}"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' must not be empty."
 #~ msgstr "Le paramètre \"{0}\" ne doit pas être vide."
 
-#, java-format
 #~ msgid "Index out of bounds. Got {0}."
 #~ msgstr "index en dehors des limites. Reçu {0}"
@@ -35862,23 +36075,20 @@
 #~ msgstr "Afficher l'historique de la primitive sélectionnée"
 
-#, java-format
 #~ msgid ""
 #~ "Hailed to set reference. Reference ID {0} does not match history ID {1}."
 #~ msgstr ""
-#~ "impossible de définir la référence. la référence d’id {0} ne correspond pas "
-#~ "à l'historique d’id {1}"
-
-#, java-format
+#~ "impossible de définir la référence. la référence d’id {0} ne correspond "
+#~ "pas à l'historique d’id {1}"
+
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Impossible de lire \"{0}\""
 
-#, java-format
 #~ msgid ""
-#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
+#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got "
+#~ "''{1}''."
 #~ msgstr ""
-#~ "valeur non autorisée pour l’attribut obligatoire \"{0}\" de type int (>=0), "
-#~ "reçu \"{1}\""
-
-#, java-format
+#~ "valeur non autorisée pour l’attribut obligatoire \"{0}\" de type int "
+#~ "(>=0), reçu \"{1}\""
+
 #~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 #~ msgstr "paramètre \"{0}\" >=0 attendu, reçu \"{1}\""
@@ -35894,5 +36104,4 @@
 #~ msgstr "Appliquer aussi pour les enfants"
 
-#, java-format
 #~ msgid ""
 #~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
@@ -35901,5 +36110,4 @@
 #~ "plus présente"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' must not be empty"
 #~ msgstr "Le paramètre ''{0}'' ne doit pas être vide."
@@ -35918,5 +36126,4 @@
 #~ msgstr "Veuillez redémarrer JOSM."
 
-#, java-format
 #~ msgid "{0} Plugin successfully downloaded."
 #~ msgid_plural "{0} Plugins successfully downloaded."
@@ -35924,11 +36131,10 @@
 #~ msgstr[1] "{0} Greffons chargés avec succès."
 
-#, java-format
 #~ msgid ""
 #~ "Loading of {0} plugin was requested. This plugin is no longer required."
 #~ msgstr ""
-#~ "Le chargement du greffon {0} a été demandé. Ce greffon n'est plus nécessaire."
-
-#, java-format
+#~ "Le chargement du greffon {0} a été demandé. Ce greffon n'est plus "
+#~ "nécessaire."
+
 #~ msgid "Contact {0}..."
 #~ msgstr "Contact de {0}…"
@@ -35942,11 +36148,10 @@
 #~ msgid "Current changeset is null. Can't upload data."
 #~ msgstr ""
-#~ "L'ensemble de changements actuel est vide. Impossible d'envoyer les données."
-
-#, java-format
+#~ "L'ensemble de changements actuel est vide. Impossible d'envoyer les "
+#~ "données."
+
 #~ msgid "Id > 0 required, got {0}"
 #~ msgstr "requis : Id > 0 obtenu : {0}"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' must not be null."
 #~ msgstr "le paramètre \"{0}\" ne doit pas être nul."
@@ -35957,14 +36162,15 @@
 #~ "Are you really sure to continue?"
 #~ msgstr ""
-#~ "Le(s) chemin(s) sélectionné(s) contien(nen)t des nœuds en dehors de la zone "
-#~ "téléchargée.\n"
+#~ "Le(s) chemin(s) sélectionné(s) contien(nen)t des nœuds en dehors de la "
+#~ "zone téléchargée.\n"
 #~ "Certains nœuds utilisés en dehors de la zone pourraient être supprimés "
 #~ "accidentellement.\n"
 #~ "Voulez-vous vraiment continuer ?"
 
-#, java-format
-#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
+#~ msgid ""
+#~ "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them all?"
+#~ "The selection contains {0} ways. Are you sure you want to simplify them "
+#~ "all?"
 #~ msgstr[0] ""
 #~ "La sélection contient {0} voie. Êtes-vous sûr de vouloir le simplifier ?"
@@ -35973,14 +36179,10 @@
 #~ "simplifier ?"
 
-#~ msgid "Are you sure?"
-#~ msgstr "Êtes-vous sûr(e) ?"
-
-#, java-format
 #~ msgid ""
 #~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
 #~ "resolve them first.</html>"
 #~ msgstr ""
-#~ "<html>Il y a des conflist non résolus dans le calque ''{0}''.<br>Vous devez "
-#~ "les résoudre d’abord.</html>"
+#~ "<html>Il y a des conflist non résolus dans le calque ''{0}''.<br>Vous "
+#~ "devez les résoudre d’abord.</html>"
 
 #~ msgid "Area style way is not closed."
@@ -35994,5 +36196,6 @@
 
 #~ msgid "The \"from\" way does not start or end at the \"via\" way."
-#~ msgstr "Le chemin \"from\" ne commence ou ne fini pas par le chemin \"via\"."
+#~ msgstr ""
+#~ "Le chemin \"from\" ne commence ou ne fini pas par le chemin \"via\"."
 
 #~ msgid "GPS point"
@@ -36000,22 +36203,23 @@
 
 #~ msgid ""
-#~ "You are about to delete nodes outside of the area you have "
-#~ "downloaded.<br>This can cause problems because other objects (that you don't "
-#~ "see) might use them.<br>Do you really want to delete?"
+#~ "You are about to delete nodes outside of the area you have downloaded."
+#~ "<br>This can cause problems because other objects (that you don't see) "
+#~ "might use them.<br>Do you really want to delete?"
 #~ msgstr ""
 #~ "Vous êtes sur le point de supprimer des nœuds en dehors de la zone "
-#~ "téléchargée. <br>Cela peut poser problème car d’autres objets (que vous ne "
-#~ "voyez pas) pourraient les utiliser.<br>Voulez-vous vraiment les supprimer ?"
+#~ "téléchargée. <br>Cela peut poser problème car d’autres objets (que vous "
+#~ "ne voyez pas) pourraient les utiliser.<br>Voulez-vous vraiment les "
+#~ "supprimer ?"
 
 #~ msgid "Wrong number of parameters for tags operator."
 #~ msgstr "Nombre incorrect de paramètres pour l'opérateur d'attributs."
 
-#, java-format
 #~ msgid ""
-#~ "Incorrect value of tags operator: {0}. Tags operator expects number of tags "
-#~ "or range, for example tags:1 or tags:2-5"
+#~ "Incorrect value of tags operator: {0}. Tags operator expects number of "
+#~ "tags or range, for example tags:1 or tags:2-5"
 #~ msgstr ""
-#~ "Valeur incorrecte pour l'opérateur d'attributs: {0}. L'opérateur d'attributs "
-#~ "attends le numéro de l'attribut ou une plage, par exemple tags:1 ou tags:2-5"
+#~ "Valeur incorrecte pour l'opérateur d'attributs: {0}. L'opérateur "
+#~ "d'attributs attends le numéro de l'attribut ou une plage, par exemple "
+#~ "tags:1 ou tags:2-5"
 
 #~ msgid "No \"via\" node or way found."
@@ -36027,5 +36231,6 @@
 #~ msgid "<html>Cannot open directory.<br>Please select a file!</html>"
 #~ msgstr ""
-#~ "<html>Impossible d'ouvrir le dossier.<br>Veuillez choisir un fichier !</html>"
+#~ "<html>Impossible d'ouvrir le dossier.<br>Veuillez choisir un fichier !</"
+#~ "html>"
 
 #~ msgid "<number>"
@@ -36039,14 +36244,11 @@
 #~ msgstr "Utiliser tous leurs éléments"
 
-#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Pile de commandes : {0}"
 
-#, java-format
 #~ msgid "Style for inner way ''{0}'' equals multipolygon."
 #~ msgstr ""
 #~ "Le modèle du chemin intérieur \"{0}\" est équivalent à un multipolygone."
 
-#, java-format
 #~ msgid "Style for restriction {0} not found."
 #~ msgstr "Le modèle de la restriction {0} n’a pas été trouvé."
@@ -36058,11 +36260,10 @@
 #~ "Automaticly select first WMS layer when grabing if multiple layers exist."
 #~ msgstr ""
-#~ "Sélectionner automatiquement le premier calque WMS lors du téléchargement du "
-#~ "cadastre."
+#~ "Sélectionner automatiquement le premier calque WMS lors du téléchargement "
+#~ "du cadastre."
 
 #~ msgid "Multipolygon inner way is outside."
 #~ msgstr "Le chemin intérieur du multipolygone est à l’extérieur."
 
-#, java-format
 #~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
 #~ msgstr "Erreur de syntaxe du motif : le motif {0} dans {1} est erroné !"
@@ -36077,24 +36278,21 @@
 #~ msgstr "Le chemin \"from\" ne commence ou ne fini pas par un nœud \"via\"."
 
-#, java-format
 #~ msgid ""
 #~ "<html>There are {0} primitives in your local dataset which<br>might be "
 #~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
-#~ "to check the state of these primitives<br>on the server.<br>Click "
+#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
+#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
 #~ "<strong>{2}</strong> to ignore.<br></html>"
 #~ msgstr ""
-#~ "<html>Il y a {0} primitives dans votre jeu de données local qui<br>semblent "
-#~ "supprimées du serveur. Si vous tentez ultérieurement de les supprimer "
-#~ "ou<br>de les mettre à jour, le serveur retournera probablement "
-#~ "un<br>conflit.<br>Cliquez sur <strong>{1}</strong> pour vérifier l’état de "
-#~ "ces primitives<br>sur le serveur.<br>Cliquez sur <strong>{2}</strong> pour "
-#~ "ignorer.<br></html>"
-
-#, java-format
+#~ "<html>Il y a {0} primitives dans votre jeu de données local "
+#~ "qui<br>semblent supprimées du serveur. Si vous tentez ultérieurement de "
+#~ "les supprimer ou<br>de les mettre à jour, le serveur retournera "
+#~ "probablement un<br>conflit.<br>Cliquez sur <strong>{1}</strong> pour "
+#~ "vérifier l’état de ces primitives<br>sur le serveur.<br>Cliquez sur "
+#~ "<strong>{2}</strong> pour ignorer.<br></html>"
+
 #~ msgid "Uploading {0} objects ..."
 #~ msgstr "Envoi de {0} objets..."
 
-#, java-format
 #~ msgid "Style for outer way ''{0}'' mismatches."
 #~ msgstr "Le modèle du chemin extérieur \"{0}\" ne correspond pas."
Index: /applications/editors/josm/i18n/po/gl.po
===================================================================
--- /applications/editors/josm/i18n/po/gl.po	(revision 21970)
+++ /applications/editors/josm/i18n/po/gl.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 21:25+0000\n"
+"POT-Creation-Date: 2010-06-23 22:47+0200\n"
+"PO-Revision-Date: 2010-06-15 17:32+0000\n"
 "Last-Translator: Dario <dario.villar.v@gmail.com>\n"
 "Language-Team: Galician <gl@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-06-15 16:21+0000\n"
+"X-Launchpad-Export-Date: 2010-06-23 20:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -23,5 +23,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
@@ -93,5 +93,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
@@ -253,5 +253,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
@@ -274,5 +274,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
@@ -280,6 +280,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
@@ -288,4 +290,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
@@ -323,6 +327,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 ""
 "<html>Non hay capas á que a capa<br>''{0}''<br>. poidese ser fundida</html>"
@@ -347,9 +351,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
@@ -409,4 +413,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
@@ -446,5 +451,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 "Información"
@@ -658,5 +663,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
@@ -671,5 +676,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 "Borrar"
@@ -793,6 +798,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29
 msgid "Download primitives referring to one of the selected primitives"
-msgstr ""
-"Descargar as primitivas referenciando a unha das primitivas escollidas"
+msgstr "Descargar as primitivas referenciando a unha das primitivas escollidas"
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
@@ -921,9 +925,9 @@
 #: ../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 ""
 "The selected ways have nodes outside of the downloaded data region."
-msgstr[0] ""
-"A via seleccionada só ten nodos fora da rexión de datos descargados"
+msgstr[0] "A via seleccionada só ten nodos fora da rexión de datos descargados"
 msgstr[1] ""
 "As vias seleccionadas só teñen nodos fora da rexión de datos descargados"
@@ -931,4 +935,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 "Esto pode levar a un borrado accidental dos nodos"
@@ -1029,6 +1034,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
 msgid "Opens a dialog that allows to jump to a specific location"
-msgstr ""
-"Abre un diálogo que che permite saltar a unha localización específica"
+msgstr "Abre un diálogo que che permite saltar a unha localización específica"
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:57
@@ -1239,6 +1243,6 @@
 msgid "<html>Cannot open directory ''{0}''.<br>Please select a file.</html>"
 msgstr ""
-"<html>Non se puido abrir directorio \"{0}\".<br>Por favor escolle un "
-"arquivo.</html>"
+"<html>Non se puido abrir directorio \"{0}\".<br>Por favor escolle un arquivo."
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:190
@@ -1306,7 +1310,7 @@
 "os ángulos sexan de 90  ou 180 grados.</h3>Pode engadir dous nodos á "
 "selección. Entón fixase a direcciónen función de eses dous nodos de "
-"referencia. (Despóis pode desfacer o movemento para algúns "
-"nodos:<br>Escóllaos e pulse o atallo Ortogonalizar / Desfacer. Por defecto "
-"éste é Shift-Q .)"
+"referencia. (Despóis pode desfacer o movemento para algúns nodos:"
+"<br>Escóllaos e pulse o atallo Ortogonalizar / Desfacer. Por defecto éste é "
+"Shift-Q .)"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45
@@ -1513,6 +1517,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
@@ -1539,4 +1543,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
@@ -1545,6 +1551,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 "Erro"
@@ -1660,6 +1666,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 ""
 "Amosar informe de estado con información de utilidade que poida ser engadida "
@@ -1697,8 +1702,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 "Si, borrar nodos"
 
 #: ../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 "Borrar nodos fora da area de datos descarga"
@@ -1707,5 +1714,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 "Non, abortar"
@@ -1713,16 +1721,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 "Cancelar operation"
 
 #: ../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 "Desexa borrala de todos modos?"
 
 #: ../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 "Borrar nodos fora da area de datos?"
 
 #: ../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 "Por favor escolla ao menos unha via para simplificar."
@@ -1731,13 +1744,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 "Sí"
 
 #: ../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 "Simplificar todas as vias seleccionadas"
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:126
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:89
 #, java-format
 msgid ""
@@ -1747,8 +1763,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 "Simplificar vias?"
 
 #: ../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"
@@ -1758,4 +1776,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)"
@@ -1893,6 +1912,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 ""
 "* Un nodo que está sendo usado por máis dunha vía e unha destas vías, ou"
@@ -1966,9 +1984,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)"
@@ -1985,5 +2003,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
@@ -2047,11 +2065,10 @@
 "''{0}''.<br>You have to resolve them first.</html>"
 msgstr ""
-"<html> Os datos a subir participan en conflictos non resoltos na capa "
-"\"{0}\". <br>Debe resolvelos primeiro.</html>"
+"<html> Os datos a subir participan en conflictos non resoltos na capa \"{0}"
+"\". <br>Debe resolvelos primeiro.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:153
 #: ../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 "Non hai cambios que subir."
@@ -2069,14 +2086,14 @@
 msgstr "Sube todos os cambios na selección actual ao servidor OSM"
 
-#: ../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 "Comprobando parentes para os obxectos borrados"
 
-#: ../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 "Lendo pais de \"{0}\""
 
-#: ../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 "Comprobando os pais suprimidos no conxunto de datos locais."
@@ -2338,5 +2355,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
@@ -2435,6 +2452,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:408
 msgid "Move a segment along its normal, then release the mouse button."
-msgstr ""
-"Move un segmento ao longo da súa normal, enton solta o botón do rato."
+msgstr "Move un segmento ao longo da súa normal, enton solta o botón do rato."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:410
@@ -2457,6 +2473,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 ""
 "Arrastrar cabezal de reproducción e soltar preto da pista para reproducir o "
@@ -2546,6 +2562,6 @@
 "move zoom with right button"
 msgstr ""
-"Facer zoom arrastrando ou con [ Ctrl+. ] ou [ Ctrl+, ]; mover con "
-"Ctrl+Frecha arriba, esquerda, abaixo, dereita; mover zoom co botón dereito"
+"Facer zoom arrastrando ou con [ Ctrl+. ] ou [ Ctrl+, ]; mover con Ctrl"
+"+Frecha arriba, esquerda, abaixo, dereita; mover zoom co botón dereito"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48
@@ -2595,5 +2611,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."
@@ -2642,11 +2658,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
-msgstr ""
-"<b>Baker Street</b> - ''Baker'' e ''Street'' en calquer clave ou nome."
+msgstr "<b>Baker Street</b> - ''Baker'' e ''Street'' en calquer clave ou nome."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
-msgstr ""
-"<b>\"Baker Street\"</b> - ''Baker Street'' en calquera clave ou nome."
+msgstr "<b>\"Baker Street\"</b> - ''Baker Street'' en calquera clave ou nome."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
@@ -2663,6 +2677,6 @@
 "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
 msgstr ""
-"<b>type=*</b> - a clave ''type'' con calquer valor. Proba tamén "
-"<b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
+"<b>type=*</b> - a clave ''type'' con calquer valor. Proba tamén <b>*=value</"
+"b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
@@ -2685,6 +2699,5 @@
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
-msgstr ""
-"<b>type:</b> - tipo do obxecto(<b>node</b>,<b>way</b>,<b>relation</b>)"
+msgstr "<b>type:</b> - tipo do obxecto(<b>node</b>,<b>way</b>,<b>relation</b>)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
@@ -2719,9 +2732,9 @@
 #: ../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)"
-msgstr ""
-"<b>nodos:</b>...- obxecto co número de nodos dado (nodos: contados ou "
-"nodos:min-max)"
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
+"min-max)"
+msgstr ""
+"<b>nodos:</b>...- obxecto co número de nodos dado (nodos: contados ou nodos:"
+"min-max)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
@@ -2782,6 +2795,6 @@
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
-"Use <b>\"</b> para entrecomiñar as operacións (p.e. se unha chave contén "
-"<b>:</b>)"
+"Use <b>\"</b> para entrecomiñar as operacións (p.e. se unha chave contén <b>:"
+"</b>)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
@@ -3009,10 +3022,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
@@ -3115,6 +3132,6 @@
 "conflict cannot be added.</html>"
 msgstr ""
-"<html>A capa \"{0}\" ainda ten un conflicto coa "
-"primitiva<br>\"{1}\".<br>Este conflicto non pode ser engadido.</html>"
+"<html>A capa \"{0}\" ainda ten un conflicto coa primitiva<br>\"{1}\"."
+"<br>Este conflicto non pode ser engadido.</html>"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36
@@ -3138,5 +3155,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
@@ -3217,11 +3234,11 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231
 msgid ""
-"You are about to delete nodes outside of the area you have "
-"downloaded.<br>This can cause problems because other objects (that you do "
-"not see) might use them.<br>Do you really want to delete?"
-msgstr ""
-"Estás a punto de borrar nodos que se atopan fora da área que "
-"descargaches.<br>Isto pode causar problemas porque outros obxectos (que non "
-"ves) poden estar usandoos.<br>Queres borralos realmente?"
+"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 ""
+"Estás a punto de borrar nodos que se atopan fora da área que descargaches."
+"<br>Isto pode causar problemas porque outros obxectos (que non ves) poden "
+"estar usandoos.<br>Queres borralos realmente?"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
@@ -3266,11 +3283,11 @@
 msgstr[1] "Mover {0} nodos"
 
-#: ../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 "Obxecto \"{0}\" purgado"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111
 #, java-format
 msgid "Purged {0} object"
@@ -3279,5 +3296,5 @@
 msgstr[1] "Pugados {0} obxectos"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 #, java-format
 msgid ""
@@ -3288,5 +3305,5 @@
 "2. Os actuais son {1}"
 
-#: ../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}"
@@ -3508,6 +3525,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 ""
 "<html>O arquivo de preferencias contén erros.<br> Realizano unha copia de "
@@ -3603,5 +3620,5 @@
 #. *
 #. * the decimal format 999.999
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3610,5 +3627,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3617,5 +3634,5 @@
 #. *
 #. * coordinates East/North
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3667,4 +3684,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}"
@@ -3676,33 +3696,24 @@
 msgstr "Non se atopou obxectivo para misturar o obxecto con id {0}"
 
-#: ../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 "Non se atopou obxectivo para misturar o nodo con id {0}"
 
-#: ../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 "Non se atopou obxectivo para misturar a relación con id {0}"
 
-#: ../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 "Non se atopa o obxectivo a misturar do tipo {0} con id {1}"
-
-#. 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 ""
-"O obxecto con ID {0} e versión {1} é visible a través da fonte do obxecto "
-"con versión anterior {2} non é visible. Non podemos manexat esta "
-"inconsistencia. Mantendo o obxecto. "
 
 #. translators notes must be in front
@@ -3781,19 +3792,19 @@
 "</p><p>Pechar o diálogo de filtrado para ver todos os obxectos.<p></html>"
 
-#: ../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 "Unha primitiva con ID = 0 non pode ser invisible."
 
-#: ../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 "ID > 0 Esperada. Tívose {0}."
 
-#: ../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 "Version > 0 Esperada. Tívose {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:795
 #, java-format
 msgid ""
@@ -3804,5 +3815,5 @@
 "changesetId é {0}"
 
-#: ../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 "
@@ -3812,5 +3823,5 @@
 "e a outra non."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1169
 #, java-format
 msgid ""
@@ -3870,6 +3881,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 ""
 "Non se pode comprar a primitiva con ID \"{0}\" coa primitiva con ID \"{1}\""
@@ -3885,5 +3895,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 "seleccionado"
@@ -3949,6 +3959,6 @@
 "NTF<->RGF93 grid"
 msgstr ""
-"Atención: Fallou ao abrir a secuencia de entrada para o recurso "
-"\"/data/{0}\". Non se pode cargar NTF <-> malla RGF93"
+"Atención: Fallou ao abrir a secuencia de entrada para o recurso \"/data/{0}"
+"\". Non se pode cargar NTF <-> malla RGF93"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:137
@@ -4049,9 +4059,8 @@
 #: ../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>"
-msgstr ""
-"<html> Non se poden ler os marcadores dende <br>\"{0}\"<br>O erro foi: "
-"{1}</html>"
+msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+"<html> Non se poden ler os marcadores dende <br>\"{0}\"<br>O erro foi: {1}</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
@@ -4121,5 +4130,5 @@
 #. color tiger_data
 #. </rule>
-#. 
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4129,5 +4138,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4136,5 +4145,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4143,5 +4152,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4150,5 +4159,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4157,5 +4166,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4164,9 +4173,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--annotation tags -->
-#. 
+#.
 #. <!--"work in progress" tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="building"/>
@@ -4175,5 +4184,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 "construcción"
@@ -4260,5 +4269,5 @@
 msgstr "Obxecto borrado"
 
-#: ../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
@@ -4282,6 +4291,5 @@
 #, java-format
 msgid "Expected non-empty value for parameter ''{0}'', got ''{1}''"
-msgstr ""
-"Esperábase un valor non vacío para o parámetro \"{0}\" tívose \"{1}\""
+msgstr "Esperábase un valor non vacío para o parámetro \"{0}\" tívose \"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
@@ -4387,6 +4395,6 @@
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
-"Abrir un arquivo (calquer tipo de arquivo que poida ser aberto con "
-"Arquivo/Abrir)"
+"Abrir un arquivo (calquer tipo de arquivo que poida ser aberto con Arquivo/"
+"Abrir)"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
@@ -4396,6 +4404,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
-msgstr ""
-"Descargar localozación na url (con lat=x&lon=y&zoom=z) como gps en crú"
+msgstr "Descargar localozación na url (con lat=x&lon=y&zoom=z) como gps en crú"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
@@ -4494,5 +4501,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
@@ -4501,4 +4508,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
@@ -4669,6 +4677,6 @@
 "relations</strong>.</html>"
 msgstr ""
-"<html>Por favor confirma o borrado de <strong>1 obxecto</strong> de "
-"<strong>{0} relacións</strong>.</html>"
+"<html>Por favor confirma o borrado de <strong>1 obxecto</strong> de <strong>"
+"{0} relacións</strong>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156
@@ -4709,5 +4717,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
@@ -4729,6 +4737,6 @@
 "level.</html>"
 msgstr ""
-"<html> Escolla un <strong> rango de teselas de OSM</OSM> nun nivel zoom "
-"dado.</html>"
+"<html> Escolla un <strong> rango de teselas de OSM</OSM> nun nivel zoom dado."
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
@@ -4748,11 +4756,11 @@
 "<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>"
-msgstr ""
-"<html>Alternativamente pode introducir unha <strong> dirección de "
-"tesela</strong> para unha tesela no formato <i> nivel_de_zoom/x/y</i>, por "
-"exemplo <i>15/256/223</i>.As direccións de teselas no formato<i>zoom,x,y</i> "
-"ou <i>zoom;x;i</i>tamén són válidas.</html>"
+"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"html>"
+msgstr ""
+"<html>Alternativamente pode introducir unha <strong> dirección de tesela</"
+"strong> para unha tesela no formato <i> nivel_de_zoom/x/y</i>, por exemplo "
+"<i>15/256/223</i>.As direccións de teselas no formato<i>zoom,x,y</i> ou "
+"<i>zoom;x;i</i>tamén són válidas.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
@@ -4783,5 +4791,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"
@@ -4790,5 +4798,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"
@@ -4797,5 +4805,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"
@@ -5002,6 +5010,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:454
 msgid "Copy my selected elements to the end of the list of merged elements."
-msgstr ""
-"Copiar a miña selección de nodos ao final da lista de nodos misturada."
+msgstr "Copiar a miña selección de nodos ao final da lista de nodos misturada."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:481
@@ -5027,6 +5034,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 ""
 "Copiar os seus elementos escollidos ao final da lista de elementos misturados"
@@ -5111,6 +5117,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their "
-"entries.</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 "<html>Prema <strong>{0}</strong> para iniciar a mistura das miñas entradas e "
@@ -5120,6 +5126,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their "
-"entries.</html>"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
+"html>"
 msgstr ""
 "<html>Prema <strong>{0}</strong> para terminar a fusión das miñas entradas e "
@@ -5176,9 +5182,9 @@
 #, java-format
 msgid ""
-"<html>An error occurred while communicating with the server<br>Details: "
-"{0}</html>"
-msgstr ""
-"<html>Ocurriu un erro mentres se comunicaba co servidor<br>Detalles: {0} "
-"</html>"
+"<html>An error occurred while communicating with the server<br>Details: {0}</"
+"html>"
+msgstr ""
+"<html>Ocurriu un erro mentres se comunicaba co servidor<br>Detalles: {0} </"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
@@ -5205,6 +5211,6 @@
 "server.<br><br>Do you want to undelete these nodes too?"
 msgstr[0] ""
-"Hai {0} nodo adicional usado pola vía {1}<br>que foi eliminado no "
-"servidor.<br><br>Quere que ese nodo volva a existir?"
+"Hai {0} nodo adicional usado pola vía {1}<br>que foi eliminado no servidor."
+"<br><br>Quere que ese nodo volva a existir?"
 msgstr[1] ""
 "Hai {0} nodos adicionais usados pola vía {1}<br>que foron eliminados no "
@@ -5398,6 +5404,5 @@
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
-msgstr ""
-"O conxunto de datos misturado non incluirá unha etiqueta coa clave {0}"
+msgstr "O conxunto de datos misturado non incluirá unha etiqueta coa clave {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
@@ -5410,10 +5415,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"
@@ -5422,10 +5429,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
@@ -5508,4 +5517,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 "ningún"
@@ -5662,6 +5672,6 @@
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
 msgstr ""
-"<html>Introduza unha clave para a etiqueta, p.e. "
-"<strong><tt>fixme</tt></strong></html>"
+"<html>Introduza unha clave para a etiqueta, p.e. <strong><tt>fixme</tt></"
+"strong></html>"
 
 #. Strings in GTK ColorChooser
@@ -5676,6 +5686,6 @@
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
 msgstr ""
-"<html>Introduza un valor para a etiqueta, p.e. <strong><tt>check "
-"members</tt></strong></html>"
+"<html>Introduza un valor para a etiqueta, p.e. <strong><tt>check members</"
+"tt></strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
@@ -5689,9 +5699,9 @@
 msgstr ""
 "<html>As vías combinadas son  membros de unha ou mais relacións. Por favor, "
-"decida se desexa <strong>manter</strong>a relación entre estes dous membros "
-", ou <strong>eliminalas.</strong> <br> Por defecto, <strong>mantén</strong> "
-"a primeira vía, e <strong>elimina</strong> a vías restantes que son membros "
-"da mesma relación: A vía combinada mantense no lugar da vía orixinal na "
-"relación.</html>"
+"decida se desexa <strong>manter</strong>a relación entre estes dous "
+"membros , ou <strong>eliminalas.</strong> <br> Por defecto, <strong>mantén</"
+"strong> a primeira vía, e <strong>elimina</strong> a vías restantes que son "
+"membros da mesma relación: A vía combinada mantense no lugar da vía orixinal "
+"na relación.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
@@ -5705,8 +5715,8 @@
 msgstr ""
 "<html>Os nodos combinados son  membros de unha ou mais relacións. Por favor, "
-"decida se desexa <strong>manter</strong>a relación entre estes dous membros "
-", ou <strong>eliminalod.</strong> <br> Por defecto, <strong>mantén</strong> "
-"o primeiro nodo, e <strong>elimina</strong>os nodos restantes que son "
-"membros da mesma relación: A vía combinada mantense no lugar do nodo "
+"decida se desexa <strong>manter</strong>a relación entre estes dous "
+"membros , ou <strong>eliminalod.</strong> <br> Por defecto, <strong>mantén</"
+"strong> o primeiro nodo, e <strong>elimina</strong>os nodos restantes que "
+"son membros da mesma relación: A vía combinada mantense no lugar do nodo "
 "orixinal na relación.</html>"
 
@@ -5726,6 +5736,6 @@
 msgid "<html>Please select the values to keep for the following tags.</html>"
 msgstr ""
-"<html>Por favor, escolla os valores a conservar para as seguintes "
-"etiquetas.</html>"
+"<html>Por favor, escolla os valores a conservar para as seguintes etiquetas."
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:48
@@ -5743,7 +5753,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 ""
 "<html>Activar para amosar soamente os conxuntos de cambios dos obxectos "
@@ -5773,6 +5783,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 ""
 "Descargar información sobre os conxuntos de cambios escollidos dende o "
@@ -5821,5 +5830,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
@@ -5896,17 +5905,16 @@
 #, 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 ""
 "<html>Non remataches de misturar as diferencias en este conflicto.<br>As "
 "resolucións de conflictos non se aplicarán a menos que todas as diferenzas "
-"<br>sexan resoltas.<br>Prema<strong>{0}</strong>para pechar de todos "
-"modos.<strong>As diferencias xa<br>resoltas non se "
-"aplicarán</strong><br>Prema<strong>{1}</strong>para seguir resolvendo os "
-"conflictos.</html>"
+"<br>sexan resoltas.<br>Prema<strong>{0}</strong>para pechar de todos modos."
+"<strong>As diferencias xa<br>resoltas non se aplicarán</"
+"strong><br>Prema<strong>{1}</strong>para seguir resolvendo os conflictos.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
@@ -5928,5 +5936,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
@@ -5934,5 +5942,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 "Engadir"
@@ -5981,5 +5989,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 "Historial"
@@ -6131,6 +6139,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373
 msgid "Create a copy of this relation and open it in another editor window"
-msgstr ""
-"Crear unha copia de esta relación e abrila en outra ventá de edición."
+msgstr "Crear unha copia de esta relación e abrila en outra ventá de edición."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:433
@@ -6201,10 +6208,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 "Escoller na lista de relacións"
 
 #: ../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 "Escoller relación an lista de relacións."
@@ -7575,6 +7582,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
-msgstr ""
-"Só conxuntos de cambios que lle pertencen ao seguinte nome de usuario"
+msgstr "Só conxuntos de cambios que lle pertencen ao seguinte nome de usuario"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
@@ -7698,6 +7704,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 ""
 
@@ -7721,8 +7727,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 ""
 
@@ -7737,6 +7743,6 @@
 msgstr ""
 "<html>Descargar os meus conxuntos de cambios abertos<br><em>Deshabilitado. "
-"Por favor, introduza os teu nome de usuario de OSM nas preferencias "
-"primeiro.</em></html>"
+"Por favor, introduza os teu nome de usuario de OSM nas preferencias primeiro."
+"</em></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:157
@@ -7845,9 +7851,9 @@
 msgstr "Esta petición de conxunto de cambios é inválida"
 
-#: ../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 "Engadir Propiedades"
 
-#: ../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."
@@ -7856,23 +7862,23 @@
 msgstr[1] "Modificaranse {0} obxectos"
 
-#: ../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 "Un valor vacío borra o atributo."
 
-#: ../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 "<diferente>"
 
-#: ../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 "Cambiar valores?"
 
-#: ../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"
@@ -7881,5 +7887,5 @@
 msgstr[1] "Cambiar as propiedades de ata {0} obxectos"
 
-#: ../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."
@@ -7888,78 +7894,78 @@
 msgstr[1] "Esto cambiará ata {0} obxectos."
 
-#: ../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 "Por favor, selecciona unha tecla"
 
-#: ../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 "Por favor selecciona un valor"
 
-#: ../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 ""
 "Por favor selecciona os obxectos dos que queres cambiar as propiedades."
 
-#: ../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 "Propiedades/Relacións"
 
-#: ../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 "Propiedades dos obxectos seleccionados."
 
 #. 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 "Membro de"
 
-#: ../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 "Posición"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Cambiar relación"
 
-#: ../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 "Borrar da relación"
 
-#: ../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 "Borrar realmente a selección da relación {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 "Borrar a clave seleccionada en todos os obxectos"
 
-#: ../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 "Borrar Propiedades"
 
-#: ../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 "Engadir un novo par clave/valor para todos os obxectos"
 
-#: ../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 "Editar o valor da clave seleccionada para todos os obxectos"
 
-#: ../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 "Escoller relación"
 
-#: ../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 "Escoller relación na selección principal"
@@ -8074,6 +8080,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 ""
 
@@ -8091,6 +8097,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 ""
 
@@ -8246,7 +8252,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 ""
 
@@ -8583,7 +8588,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 ""
 
@@ -8724,6 +8728,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 ""
 
@@ -8733,6 +8737,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 ""
 
@@ -9015,9 +9019,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 ""
 "<html>A actualización <strong>fallou</strong> porque o servidor ten unha "
@@ -9040,8 +9043,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 ""
 "<html>A subida <strong>fallou</strong> porque o servidor tiña unha versión "
@@ -9292,5 +9294,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 ""
@@ -9298,6 +9300,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 ""
 
@@ -9382,6 +9383,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] ""
@@ -9395,6 +9396,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 "
@@ -9620,5 +9621,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9644,6 +9645,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 ""
 
@@ -9698,6 +9698,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 ""
 
@@ -9751,7 +9751,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 ""
 
@@ -9761,5 +9761,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9775,5 +9775,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..."
@@ -9784,6 +9784,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 ""
 
@@ -10001,7 +10000,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 ""
 
@@ -10027,7 +10026,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 ""
 
@@ -10091,6 +10090,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 ""
 "<html>A subida de datos GPS sen procesar como datos de mapa considerase "
@@ -10274,6 +10273,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 ""
 
@@ -10333,7 +10332,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 ""
 
@@ -10910,6 +10909,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 ""
 
@@ -10931,8 +10930,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 ""
 
@@ -11052,6 +11051,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 ""
 
@@ -11161,6 +11160,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 ""
 
@@ -11294,8 +11292,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 ""
 
@@ -11378,8 +11376,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 ""
 
@@ -11406,7 +11404,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 ""
 
@@ -11458,5 +11456,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 "Por favor seleccione a fila a borrar."
@@ -11528,6 +11526,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:74
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr ""
-"Cando se importe audio, aplicalo a calquera punto de vía na capa GPX."
+msgstr "Cando se importe audio, aplicalo a calquera punto de vía na capa GPX."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:79
@@ -11836,6 +11833,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 ""
 "Debuxar as frechas de dirección usando búsquedas nas táboas en lugar de "
@@ -11901,6 +11897,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 ""
 "Aplicar filtros antialiasing á vista do mapa para acadar unha apariencia "
@@ -11976,5 +11971,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 "Activar os valores predeterminados incorporadas"
@@ -11994,6 +11989,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>:"
@@ -12118,6 +12112,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 ""
 
@@ -12130,9 +12124,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 ""
 
@@ -12155,6 +12149,6 @@
 "encountered.</p>"
 msgstr ""
-"<p>O pseudo modificador ''desactivado'' desactivará o atallo cando o "
-"atope.</p>"
+"<p>O pseudo modificador ''desactivado'' desactivará o atallo cando o atope.</"
+"p>"
 
 #. scroll up
@@ -12433,6 +12427,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 ""
 
@@ -12443,5 +12437,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 ""
@@ -12451,18 +12445,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 ""
@@ -12471,5 +12465,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 ""
@@ -12478,5 +12472,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 ""
@@ -12485,9 +12479,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 "Ordenar o menú de elementos preestablecidos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
 msgid "Tagging Presets"
 msgstr "Axustes de etiquetado preestablecidos."
@@ -12596,6 +12590,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 ""
 
@@ -12617,6 +12611,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 ""
 
@@ -12695,6 +12689,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 ""
 
@@ -12710,6 +12703,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 ""
 
@@ -12803,6 +12795,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 ""
 
@@ -12935,4 +12927,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 "Cambiar Propiedades"
@@ -13098,5 +13091,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
@@ -13116,5 +13109,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}''"
@@ -13244,6 +13237,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
 msgid "Parse error: invalid document structure for GPX document."
-msgstr ""
-"Erro de análise: estrutura de documento non válida para documento gpx"
+msgstr "Erro de análise: estrutura de documento non válida para documento gpx"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
@@ -13282,6 +13274,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 ""
 
@@ -13398,10 +13389,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 ""
@@ -13409,69 +13400,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 "Pechando colección de cambios..."
 
-#: ../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}."
@@ -13554,6 +13545,5 @@
 msgid ""
 "Illegal value for mandatory attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-"Valor ilegal para o atributo \"{0}\" de tipo doble. Obtívose \"{1}\"."
+msgstr "Valor ilegal para o atributo \"{0}\" de tipo doble. Obtívose \"{1}\"."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:139
@@ -13584,6 +13574,6 @@
 "({1},{2}). Skipping."
 msgstr ""
-"Atención: elemento de comezo \"{0}\" no conxunto de cambios na posición "
-"({1},{2}). Saltando."
+"Atención: elemento de comezo \"{0}\" no conxunto de cambios na posición ({1},"
+"{2}). Saltando."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:241
@@ -13661,4 +13651,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})"
@@ -13678,9 +13669,9 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error "
-"is:<br>{0}</html>"
-msgstr ""
-"<html>Ocurriu un erro mentres se recuperaba un arquivo.<br>O Erro "
-"é:<br>{0}</html>"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
+"html>"
+msgstr ""
+"<html>Ocurriu un erro mentres se recuperaba un arquivo.<br>O Erro é:<br>{0}</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
@@ -13707,6 +13698,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 ""
 
@@ -13751,6 +13742,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 ""
 "Valor ilegal para o atributo \"ref\" no membro na relación {0}.Obtívose {1}"
@@ -13769,6 +13759,6 @@
 "Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
 msgstr ""
-"Valor ilegal para o atributo \"type\" no membro  {0} da relación {1} "
-".Obtívose {2}."
+"Valor ilegal para o atributo \"type\" no membro  {0} da relación {1} ."
+"Obtívose {2}."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
@@ -14105,6 +14095,6 @@
 "valid URL. Skipping download."
 msgstr ""
-"Atención: Non se pode descargar o plugin \"{0}\". O enlace de descarga "
-"\"{1}\" non é unha URL válida. Saltando a descarga."
+"Atención: Non se pode descargar o plugin \"{0}\". O enlace de descarga \"{1}"
+"\" non é unha URL válida. Saltando a descarga."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:167
@@ -14129,6 +14119,5 @@
 "The following plugins are no longer necessary and have been deactivated:"
 msgstr[0] "O seguinte complemento xa non é preciso e foi desactivado:"
-msgstr[1] ""
-"Os seguintes complementos xa non son precisos e foron desactivados:"
+msgstr[1] "Os seguintes complementos xa non son precisos e foron desactivados:"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
@@ -14201,6 +14190,6 @@
 "Unexpected value ''{0}'' for preference ''{1}''. Assuming value ''ask''."
 msgstr ""
-"Valor inesperado \"{0}\" para a preferencia \"{1}\". Asumindo o valor "
-"\"ask\"."
+"Valor inesperado \"{0}\" para a preferencia \"{1}\". Asumindo o valor \"ask"
+"\"."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
@@ -14221,10 +14210,10 @@
 #, 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 ""
 "<html>Complemento {0} require a versión de JOSM {1}. A versión actual de "
-"JOSM é {2}.<br>É preciso que se actualice JOSM para usar este "
-"complemento.</html>"
+"JOSM é {2}.<br>É preciso que se actualice JOSM para usar este complemento.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
@@ -14264,6 +14253,5 @@
 msgid_plural "JOSM could not find information about the following plugins:"
 msgstr[0] "JOSM non puido atopar información sobre o complemento seguinte:"
-msgstr[1] ""
-"JOSM non puido atopar información sobre os complementos seguintes:"
+msgstr[1] "JOSM non puido atopar información sobre os complementos seguintes:"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:528
@@ -14445,6 +14433,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 ""
 
@@ -14511,5 +14498,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"
@@ -14592,17 +14579,17 @@
 msgid ""
 "<html>Uploading to the server <strong>failed</strong> because your "
-"current<br>dataset violates a precondition.<br>The error message "
-"is:<br>{0}</html>"
+"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
+"html>"
 msgstr ""
 "<html>A subida ao servidor <strong>fallou</strong> porque o teu<br>paquete "
-"de datos actual viola a condición previa.<br>A mensaxe de erro "
-"é:<br>{0}</html>"
+"de datos actual viola a condición previa.<br>A mensaxe de erro é:<br>{0}</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:113
 #, 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 ""
 
@@ -14610,7 +14597,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 ""
 
@@ -14618,8 +14605,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 ""
 
@@ -14639,7 +14626,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 ""
 
@@ -14708,7 +14695,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 ""
 
@@ -14720,7 +14706,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 ""
 
@@ -14752,6 +14738,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 ""
 
@@ -15261,6 +15247,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>"
@@ -15287,6 +15273,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"
@@ -15324,6 +15310,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"
@@ -15339,7 +15325,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"
@@ -15390,9 +15376,29 @@
 msgstr "Números:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:134
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#, fuzzy
+msgid "Big buildings mode"
+msgstr "Establecer tamaño dos edificios"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#, fuzzy
+msgid "Rotate crosshair"
+msgstr "Xirar á dereita"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#, fuzzy
+msgid "Advanced settings"
+msgstr "Información do obxecto avanzada"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#, fuzzy
+msgid "Building tag:"
+msgstr "Edificio"
+
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:234
 msgid "Cannot place building outside of the world."
 msgstr "Non emplazar edificios fora do mundo."
 
-#: ../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"
@@ -15401,35 +15407,46 @@
 #: ../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 "Establecer tamaño dos edificios"
 
-#: ../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 "Crear edificio."
+
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
 msgid "Buildings width:"
 msgstr "Ancho de edificios:"
 
-#: ../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
+#, fuzzy
+msgid "Advanced..."
+msgstr "Avanzado"
+
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:65
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 msgid "Draw buildings"
 msgstr "Dibuxar edificios"
 
-#: ../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
+#, fuzzy
+msgid "Set width of the building"
 msgstr "Establecer ancho de edificios"
 
@@ -15612,7 +15629,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--waterway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15622,5 +15639,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15630,5 +15647,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15644,5 +15661,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15652,5 +15669,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15658,8 +15675,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 "auga"
@@ -15681,5 +15698,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15688,5 +15705,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15695,5 +15712,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15702,5 +15719,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15709,5 +15726,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15716,10 +15733,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 "enderezo"
@@ -15748,11 +15765,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 ""
 
@@ -16184,6 +16200,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 ""
@@ -16368,4 +16384,52 @@
 msgstr "Non se atopou capa de datos GPX"
 
+#: ../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 "Editar zoo"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#, fuzzy
+msgid "Name:"
+msgstr "Nome"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#, fuzzy
+msgid "CmdLine:"
+msgstr "Coordenadas:"
+
+#: ../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
+#, fuzzy, java-format
+msgid "Delete tool \"{0}\"?"
+msgstr "Borrar nodo {0}"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:74
+msgid "Are you sure?"
+msgstr ""
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
+#, fuzzy
+msgid "New tool..."
+msgstr "Novo papel"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
+#, fuzzy
+msgid "Install"
+msgstr "Industrial"
+
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
 msgid "Position only"
@@ -16636,5 +16700,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#. 
+#.
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16755,6 +16819,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 ""
 
@@ -16773,7 +16836,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 ""
 
@@ -17002,6 +17064,5 @@
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:154
 msgid "Unable to find via nodes. Please check your selection"
-msgstr ""
-"Non foi posible atopar nodos de vias. Por favor revise a sua selección"
+msgstr "Non foi posible atopar nodos de vias. Por favor revise a sua selección"
 
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:38
@@ -17081,6 +17142,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 ""
 "A cabeceira conten varios valores que non poden ser mapeados en unha soa "
@@ -17192,6 +17252,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 ""
 
@@ -17242,6 +17301,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 ""
 
@@ -17606,5 +17664,5 @@
 msgstr "Revertir"
 
-#: ../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}"
@@ -17655,4 +17713,41 @@
 msgid "Revert changeset #{0}"
 msgstr ""
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:78
+#, fuzzy
+msgid "Road Sign Plugin"
+msgstr "Cargando extensións"
+
+#: ../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 "Non se puido ler a fonte de etiquetado preestablecido: {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 "Selección: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:111
+#, fuzzy, java-format
+msgid "Additional sign {0}"
+msgstr "Engadir relación {0}"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -17759,4 +17854,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 "Simplificar Vía"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
+#, fuzzy
+msgid "Delete unnecessary nodes from an area."
+msgstr "Borrar nodos innecesarios de unha via"
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
 msgid "Slippy Map"
@@ -18550,6 +18656,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 ""
 
@@ -18635,8 +18741,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 ""
 
@@ -18690,8 +18796,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 ""
 
@@ -18803,6 +18909,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 ""
 
@@ -18810,6 +18916,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 ""
 
@@ -19460,7 +19566,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 ""
 
@@ -19657,9 +19762,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 ""
@@ -19755,11 +19860,148 @@
 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
+#, fuzzy, java-format
+msgid "{0} {1}% of GPS track"
+msgstr "{0} componse de {1} trazado"
+
+#: ../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 "Importar Audio"
+
+#: ../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 "Eliminar"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
+#, fuzzy
+msgid "removes current video from layer"
+msgstr "Eliminar foto da capa"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
+#, fuzzy
+msgid "play/pause"
+msgstr "Reproducción/Pausa"
+
+#: ../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 "fondo"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
+#, fuzzy
+msgid "jumps n sec back"
+msgstr "Saltar cara atrás."
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "forward"
+msgstr "Avance"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "jumps n sec forward"
+msgstr "Saltar cara adiante"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
+#, fuzzy
+msgid "faster"
+msgstr "Máis rápido"
+
+#: ../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 "Máis lento"
+
+#: ../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 "Permite engadir marcadores/nodos ás posicións GPS actuais."
+
+#. 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
+#, fuzzy
+msgid "Jump length"
+msgstr "Saltar ahi"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#, fuzzy
+msgid "Set the length of a jump"
+msgstr "Establecer a linguaxe"
+
+#: ../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
+#, fuzzy
+msgid "Loop length"
+msgstr "Lonxitude: "
+
+#: ../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
+#, fuzzy
+msgid "deinterlacing using linear interpolation"
+msgstr "Interpolación do filtro de imaxe:"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:99
+#, fuzzy
+msgid "play"
+msgstr "capa"
+
+#: ../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 ""
 
@@ -19972,28 +20214,28 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
 msgid "Automatic downloading"
 msgstr ""
 
-#: ../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 ""
@@ -20004,113 +20246,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 ""
 
-#: ../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 ""
 
-#: ../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 "Gardar capa WMS nun ficheiro"
 
-#: ../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 "Cargar capa WMS dende ficheiro"
 
-#: ../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 "Versión de ficheiro WMS non soportado; atopouse {0}, esperabase {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
 msgid "File Format Error"
 msgstr "Erro de Formato de Ficheiro"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449
 msgid "Error loading file"
 msgstr "Erro cargando ficheiro"
 
-#: ../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 ""
 
-#: ../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 "Abrir unha capa WMS en branco para cargar datos dende un ficheiro"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
 msgid "WMS Plugin Preferences"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "Nome do menú"
 
-#: ../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 "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "Menu Name (Default)"
 msgstr "Nome de Menú (Predeterminado)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "WMS URL (Default)"
 msgstr "URL WMS (Predeterminada)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:86
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
 msgid "Enter a menu name and WMS URL"
 msgstr "Introduce un nome de menú e unha URL WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:111
 msgid "Copy Selected Default(s)"
 msgstr "Copiar a/as escolla/s por defecto"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
 msgid "Please select at least one row to copy."
 msgstr "Escolla polo menos unha fila para copiar"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
 msgid "Downloader:"
 msgstr "Xestor de descarga:"
@@ -20127,4 +20369,9 @@
 msgid "% of north:"
 msgstr "% cara o Norte"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186
+#, fuzzy
+msgid "Simultaneous connections"
+msgstr "Nodo: conexión"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -20136,7 +20383,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
@@ -20186,8 +20433,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 "plantación forestal"
@@ -20204,7 +20451,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--boundary tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -20214,5 +20461,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -20255,5 +20502,5 @@
 #. color boundary
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -20263,5 +20510,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -20271,5 +20518,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -20279,15 +20526,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 "fronteira"
@@ -20303,5 +20550,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -20310,7 +20557,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--route tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -20320,5 +20567,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -20328,5 +20575,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -20336,5 +20583,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -20344,5 +20591,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -20352,5 +20599,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -20360,5 +20607,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -20368,12 +20615,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 "ruta"
@@ -20651,21 +20898,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 "
@@ -20675,10 +20921,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:34
 msgid "Helps vectorizing WMS images."
 msgstr "Axuda a vectorizar imaxes WMS."
 
 #. 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."
@@ -20686,5 +20932,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 "
@@ -20694,15 +20940,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 "
@@ -20711,5 +20957,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 "
@@ -20719,15 +20965,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"
@@ -20735,5 +20981,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."
@@ -20741,5 +20987,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 "
@@ -20748,5 +20994,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 "
@@ -20755,10 +21001,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."
@@ -20766,15 +21012,16 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "Let other applications send commands to JOSM."
 msgstr "Permitir outras aplicacións enviar ordes a JOSM."
 
 #. Plugin reverter
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid "Plugin for reverting changesets"
 msgstr "Complemento para desfacer conxuntos de cambios"
 
+#. 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 "
@@ -20786,10 +21033,17 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:71
 msgid "Provides routing capabilities."
 msgstr "Proporciona capacidades de enrutamento."
 
+#. 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 "
@@ -20798,15 +21052,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:77
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Permite engadir marcadores/nodos ás posicións GPS actuais."
 
 #. 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 "
@@ -20816,10 +21070,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). "
@@ -20828,5 +21082,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) "
@@ -20835,5 +21089,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:89
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20844,10 +21098,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:91
 msgid "Allows undeleting object from OSM database"
 msgstr "Permite desfacer o borrado de obxetos da base de datos de OSM"
 
 #. 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 "
@@ -20858,5 +21112,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 "
@@ -20866,5 +21120,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:97
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20875,5 +21129,5 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:99
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
@@ -20881,10 +21135,10 @@
 
 #. 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 "
@@ -20895,5 +21149,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:105
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21783,10 +22037,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 "rotonda"
@@ -21923,8 +22177,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"/>
@@ -22134,5 +22388,5 @@
 #. color motorroad
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -22142,5 +22396,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -22159,5 +22413,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -22167,5 +22421,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -22184,5 +22438,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -22192,5 +22446,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -22209,5 +22463,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -22217,5 +22471,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -22230,5 +22484,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -22246,8 +22500,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 "rúa urbana"
@@ -22262,5 +22516,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -22269,5 +22523,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--public_transport tags -->
 #. <rule>
@@ -22277,10 +22531,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 "vía de servicio"
@@ -22295,5 +22549,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -22302,5 +22556,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -22310,10 +22564,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 "en construcción"
@@ -23105,6 +23359,5 @@
 #: build/trans_presets.java:888
 msgid "Bump Gate"
-msgstr ""
-"Porta de golpe (en fincas gandeiras, que se abre sin saír do vehículo)"
+msgstr "Porta de golpe (en fincas gandeiras, que se abre sin saír do vehículo)"
 
 #. item "Barriers/Bump Gate"
@@ -23320,9 +23573,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 "marísma"
@@ -23652,5 +23905,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -23660,5 +23913,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -23668,5 +23921,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -23676,5 +23929,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -23684,5 +23937,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -23692,5 +23945,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -23700,5 +23953,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -23709,5 +23962,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -23715,9 +23968,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 "ferrocarril"
@@ -25127,5 +25380,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -25135,5 +25388,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -25143,5 +25396,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -25151,5 +25404,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -25513,7 +25766,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--sport tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -25523,5 +25776,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -25531,5 +25784,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -25539,5 +25792,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -25547,5 +25800,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -25555,5 +25808,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -25563,5 +25816,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -25571,5 +25824,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -25579,5 +25832,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -25587,5 +25840,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -25595,5 +25848,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -25603,5 +25856,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -25611,5 +25864,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -25619,5 +25872,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -25627,5 +25880,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -25635,5 +25888,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -25643,5 +25896,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -25651,5 +25904,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -25659,5 +25912,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -25667,5 +25920,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -25675,5 +25928,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -25683,5 +25936,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -25691,5 +25944,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -25699,5 +25952,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -25707,5 +25960,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -25715,5 +25968,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -25723,5 +25976,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -25731,5 +25984,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -25739,5 +25992,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -25747,5 +26000,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -25755,5 +26008,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -25763,5 +26016,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -25771,5 +26024,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -25779,5 +26032,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -25787,5 +26040,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -25795,5 +26048,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -25803,5 +26056,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -25811,5 +26064,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -25819,5 +26072,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -25827,5 +26080,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -25835,5 +26088,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -25843,5 +26096,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -25851,5 +26104,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -25859,5 +26112,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -25867,5 +26120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -25875,5 +26128,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -25883,33 +26136,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 "deporte"
@@ -27587,7 +27840,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--landuse tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -27597,5 +27850,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -27605,5 +27858,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -27613,5 +27866,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -27621,5 +27874,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -27629,5 +27882,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -27637,5 +27890,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -27645,5 +27898,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -27653,12 +27906,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 "verde"
@@ -29074,5 +29327,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -29088,5 +29341,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -29096,18 +29349,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 -->
@@ -29116,7 +29386,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- cycleway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -29126,5 +29396,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -29134,5 +29404,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -29142,5 +29412,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -29150,12 +29420,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 "bicicleta"
@@ -29182,5 +29453,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -29196,5 +29467,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -29204,5 +29475,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -29211,13 +29482,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"/>
@@ -29228,11 +29507,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 "pé"
@@ -29251,8 +29531,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 "metro"
@@ -29364,9 +29644,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
@@ -29374,5 +29654,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,
@@ -29382,8 +29662,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
@@ -29397,5 +29677,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#. 
+#.
 #: build/trans_style.java:72
 msgid "standard"
@@ -29403,5 +29683,5 @@
 
 #. mappaint style named "standard"
-#. 
+#.
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -29450,6 +29730,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>
@@ -29529,5 +29809,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -29537,16 +29817,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 "obsoleto"
@@ -29557,5 +29837,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -29564,5 +29844,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -29571,5 +29851,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -29585,5 +29865,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -29597,5 +29877,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -29604,5 +29884,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -29611,5 +29891,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -29618,5 +29898,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -29625,5 +29905,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -29632,5 +29912,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -29639,5 +29919,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxweight"/>
@@ -29646,5 +29926,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxheight"/>
@@ -29653,5 +29933,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -29660,5 +29940,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxlength"/>
@@ -29667,5 +29947,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -29674,5 +29954,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="minspeed"/>
@@ -29681,5 +29961,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxstay"/>
@@ -29688,5 +29968,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="toll"/>
@@ -29695,5 +29975,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="barrier"/>
@@ -29870,7 +30150,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- highway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -29884,5 +30164,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -29892,7 +30172,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- tracktype tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -29902,5 +30182,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -29910,5 +30190,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -29918,5 +30198,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -29926,10 +30206,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 "pista"
@@ -29940,5 +30220,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -29947,5 +30227,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -29955,5 +30235,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -29962,5 +30242,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -29969,5 +30249,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -29976,5 +30256,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -29983,5 +30263,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -29990,5 +30270,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -29997,5 +30277,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -30004,5 +30284,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -30011,5 +30291,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -30018,8 +30298,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 "servizos"
@@ -30030,8 +30310,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 "vado"
@@ -30042,5 +30322,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -30049,8 +30329,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 "círculo de xiro"
@@ -30061,9 +30341,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 "Punto de acceso de emerxencias"
@@ -30074,9 +30354,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 "ribeira"
@@ -30087,8 +30367,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 "fluxo"
@@ -30099,8 +30379,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 "muelle"
@@ -30111,5 +30391,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -30118,5 +30398,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -30125,5 +30405,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -30133,5 +30413,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -30140,5 +30420,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -30147,5 +30427,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -30154,5 +30434,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -30162,5 +30442,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -30171,5 +30451,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -30179,7 +30459,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--man_made tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -30189,5 +30469,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -30197,5 +30477,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -30205,5 +30485,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -30214,5 +30494,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -30221,5 +30501,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -30229,5 +30509,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -30237,5 +30517,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -30245,5 +30525,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -30253,5 +30533,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -30261,5 +30541,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -30269,5 +30549,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -30277,5 +30557,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -30285,5 +30565,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -30293,18 +30573,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 "feito polo home"
@@ -30314,9 +30594,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 "rápidos"
@@ -30327,7 +30607,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- railway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -30337,5 +30617,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -30344,5 +30624,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -30352,5 +30632,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -30359,5 +30639,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -30367,5 +30647,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -30375,10 +30655,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 "punto ferroviario"
@@ -30389,5 +30669,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -30398,13 +30678,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 "outros ferrocarriles"
 
 #. color otherrail
-#: build/trans_style.java:1192
+#: build/trans_style.java:1217
 msgid "railover"
 msgstr "paso con mais dun cruce ferroviario"
@@ -30415,5 +30695,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -30423,5 +30703,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30434,5 +30714,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30440,7 +30720,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 "vía morta"
@@ -30451,5 +30731,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -30458,5 +30738,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -30465,5 +30745,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -30472,7 +30752,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aeroway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -30483,9 +30763,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 "aerovía"
@@ -30496,8 +30776,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 "terminal"
@@ -30508,5 +30788,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -30516,8 +30796,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 "pista (oscuro)"
@@ -30528,8 +30808,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 "pista (claro)"
@@ -30540,5 +30820,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -30547,5 +30827,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -30554,7 +30834,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aerialway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -30564,5 +30844,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -30572,5 +30852,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -30580,5 +30860,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -30588,5 +30868,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -30596,10 +30876,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 "pista de rodadura"
@@ -30610,11 +30890,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 "pista fácil"
@@ -30625,9 +30905,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 "pista intermedia"
@@ -30638,9 +30918,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 "pista avanzada"
@@ -30651,9 +30931,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 "pista para expertos"
@@ -30664,9 +30944,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 "pista de estilo libre"
@@ -30677,9 +30957,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 "pista para iniciados"
@@ -30690,7 +30970,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--power tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -30700,5 +30980,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -30707,5 +30987,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -30715,5 +30995,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -30723,5 +31003,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -30731,5 +31011,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -30739,5 +31019,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -30747,5 +31027,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -30755,5 +31035,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -30763,5 +31043,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -30771,5 +31051,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -30779,5 +31059,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -30787,5 +31067,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -30795,15 +31075,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 "enerxía"
@@ -30813,9 +31093,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 "porto"
@@ -30826,8 +31106,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 "tubería"
@@ -30837,7 +31117,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--leisure tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -30847,5 +31127,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -30855,5 +31135,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -30863,5 +31143,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -30871,5 +31151,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -30879,5 +31159,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -30887,5 +31167,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -30895,5 +31175,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -30903,5 +31183,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -30911,5 +31191,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -30919,5 +31199,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -30927,5 +31207,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -30935,5 +31215,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -30943,5 +31223,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -30951,5 +31231,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -30959,5 +31239,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -30967,17 +31247,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 "ocio"
@@ -30987,9 +31267,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 "porto deportivo"
@@ -30999,7 +31279,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--amenity tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -31009,5 +31289,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -31017,5 +31297,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -31025,5 +31305,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -31033,5 +31313,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -31041,5 +31321,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -31049,5 +31329,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -31057,5 +31337,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -31065,5 +31345,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -31073,5 +31353,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -31081,14 +31361,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 "servizos"
@@ -31098,5 +31378,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -31106,5 +31386,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -31114,5 +31394,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -31122,5 +31402,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -31130,5 +31410,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -31138,5 +31418,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -31146,5 +31426,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -31154,5 +31434,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -31162,5 +31442,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -31170,5 +31450,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -31178,5 +31458,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -31186,14 +31466,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 "tráfico de ocio"
@@ -31203,5 +31483,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -31210,5 +31490,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -31218,5 +31498,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -31225,5 +31505,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -31233,5 +31513,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -31241,5 +31521,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -31249,5 +31529,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -31256,5 +31536,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -31264,5 +31544,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -31272,5 +31552,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -31280,5 +31560,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -31288,5 +31568,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -31295,5 +31575,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -31302,5 +31582,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -31309,5 +31589,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -31316,5 +31596,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -31323,5 +31603,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -31330,5 +31610,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -31337,5 +31617,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -31344,5 +31624,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -31351,5 +31631,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -31358,5 +31638,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -31365,5 +31645,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -31372,5 +31652,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -31379,5 +31659,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -31387,5 +31667,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -31395,5 +31675,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -31403,5 +31683,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -31411,5 +31691,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -31419,5 +31699,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -31427,5 +31707,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -31435,5 +31715,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -31443,5 +31723,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -31451,5 +31731,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -31460,5 +31740,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -31468,5 +31748,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -31476,5 +31756,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -31484,5 +31764,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -31492,5 +31772,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -31500,5 +31780,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -31508,5 +31788,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -31516,5 +31796,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -31524,5 +31804,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -31532,5 +31812,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -31540,5 +31820,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -31548,5 +31828,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -31556,5 +31836,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -31564,5 +31844,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -31572,5 +31852,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -31580,5 +31860,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"/>
@@ -31588,5 +31876,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -31596,5 +31884,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -31604,5 +31892,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -31612,5 +31900,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -31619,27 +31907,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 "equipamento lumínico"
@@ -31649,5 +31938,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -31657,5 +31946,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -31665,12 +31954,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 "auga (claro)"
@@ -31680,5 +31969,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -31688,5 +31977,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -31696,5 +31985,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -31704,5 +31993,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -31712,5 +32001,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -31720,5 +32009,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -31728,11 +32017,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 "saúde"
@@ -31742,7 +32031,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--shop tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -31752,5 +32041,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -31760,5 +32049,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -31768,5 +32057,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -31776,5 +32065,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -31784,5 +32073,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -31792,5 +32081,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -31800,5 +32089,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -31808,5 +32097,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -31816,5 +32105,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -31824,5 +32113,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -31832,5 +32121,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -31840,5 +32129,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -31848,5 +32137,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -31856,5 +32145,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -31864,5 +32153,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -31872,5 +32161,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -31880,5 +32169,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -31888,5 +32177,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -31896,5 +32185,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -31904,5 +32193,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -31912,5 +32201,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -31920,5 +32209,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -31928,5 +32217,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -31936,5 +32225,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -31944,5 +32233,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -31952,5 +32241,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -31960,5 +32249,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -31968,5 +32257,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -31976,5 +32265,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -31984,5 +32273,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -31992,5 +32281,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -32000,5 +32289,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -32008,5 +32297,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -32016,5 +32305,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -32024,5 +32313,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -32032,5 +32321,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -32040,5 +32329,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -32048,5 +32337,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -32056,5 +32345,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -32064,5 +32353,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -32072,5 +32361,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -32080,31 +32369,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 "tenda"
@@ -32114,7 +32403,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--tourism tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -32124,5 +32413,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -32132,5 +32421,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -32140,5 +32429,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -32148,5 +32437,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -32156,5 +32445,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -32164,5 +32453,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -32172,12 +32461,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 "hotel"
@@ -32187,5 +32476,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -32195,5 +32484,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -32203,5 +32492,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -32211,5 +32500,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -32219,5 +32508,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -32227,5 +32516,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -32236,5 +32525,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -32244,5 +32533,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- information tags -->
 #. <rule>
@@ -32252,5 +32541,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -32260,5 +32549,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -32267,5 +32556,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -32274,13 +32563,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 "turismo"
@@ -32290,7 +32579,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--historic tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -32300,5 +32589,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -32308,5 +32597,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -32316,5 +32605,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -32324,5 +32613,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -32332,5 +32621,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -32340,5 +32629,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -32348,5 +32637,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -32356,5 +32645,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -32364,13 +32653,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 "patrimonio histórico"
@@ -32380,8 +32669,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 "canteira"
@@ -32392,8 +32681,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 "vertedoiro"
@@ -32404,5 +32693,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -32412,8 +32701,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 "cunca"
@@ -32424,8 +32713,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 "edificio agrario"
@@ -32436,6 +32725,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
-#. 
+#.
+#.
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -32445,8 +32734,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 "venta ao por menor"
@@ -32457,8 +32746,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 "industrial"
@@ -32469,8 +32758,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 "área postindustrial degradada"
@@ -32481,8 +32770,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 "zona verde"
@@ -32493,8 +32782,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 "zona ferroviaria"
@@ -32505,5 +32794,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -32513,7 +32802,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--military tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -32523,5 +32812,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -32531,5 +32820,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -32539,5 +32828,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -32547,11 +32836,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 "zona militar"
@@ -32562,8 +32851,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 "cemiterio"
@@ -32573,8 +32862,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 "pico"
@@ -32585,9 +32874,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 "glaciar"
@@ -32597,9 +32886,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 "volcán"
@@ -32609,5 +32898,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -32618,5 +32907,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -32626,5 +32915,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -32634,5 +32923,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -32642,5 +32931,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -32650,12 +32939,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 "espazo natural"
@@ -32665,9 +32954,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 "matorral"
@@ -32677,9 +32966,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 "monte"
@@ -32689,9 +32978,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 "área forestal"
@@ -32701,9 +32990,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 "lodazal"
@@ -32713,9 +33002,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 "praia"
@@ -32726,5 +33015,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?
@@ -32750,5 +33039,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -32759,11 +33048,11 @@
 #. </rule>
 #. -->
-#. 
+#.
 #. <!--name tags -->
-#. 
+#.
 #. <!--preferences tags -->
-#. 
+#.
 #. <!--place tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -32773,5 +33062,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -32781,5 +33070,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -32789,5 +33078,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -32797,5 +33086,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -32805,5 +33094,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -32813,5 +33102,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -32821,5 +33110,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -32829,5 +33118,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -32837,5 +33126,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -32845,5 +33134,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -32853,5 +33142,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -32861,15 +33150,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 "lugar"
@@ -32879,9 +33168,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 "datos_TIGER"
@@ -32972,5 +33261,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#. 
+#.
 #. Data type can be:
 #. node        - a node point
@@ -32978,28 +33267,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
@@ -33114,5 +33403,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#. 
+#.
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -33125,5 +33414,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>
@@ -33148,6 +33437,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#. 
-#. 
+#.
+#.
 #. only for Germany
 #: build/trans_wms.java:17
@@ -33156,6 +33445,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#. 
-#. 
+#.
+#.
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -33170,6 +33459,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
@@ -33183,6 +33472,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
@@ -33202,6 +33491,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#. 
-#. 
+#.
+#.
 #. only for Japan
 #: build/trans_wms.java:39
@@ -33225,6 +33514,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
@@ -33236,4 +33525,13 @@
 msgid "Sicily - Italy"
 msgstr "Sicilia - Italia"
+
+#~ 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 ""
+#~ "O obxecto con ID {0} e versión {1} é visible a través da fonte do obxecto "
+#~ "con versión anterior {2} non é visible. Non podemos manexat esta "
+#~ "inconsistencia. Mantendo o obxecto. "
 
 #~ msgid "Do not show again"
@@ -33256,5 +33554,4 @@
 #~ msgstr "Versión descoñecida"
 
-#, java-format
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr "Saltando unha via porque inclue un nodo que non existe: {0}\n"
@@ -33321,5 +33618,4 @@
 #~ msgstr "Mover cara abaixo"
 
-#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Editor de Relación: {0}"
@@ -33335,11 +33631,10 @@
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version selected "
-#~ "in the history list."
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
 #~ msgstr ""
-#~ "Revertir o estado de todos os obxectos seleccionados actualmenete á versión "
-#~ "seleccionada na lista do historial."
-
-#, java-format
+#~ "Revertir o estado de todos os obxectos seleccionados actualmenete á "
+#~ "versión seleccionada na lista do historial."
+
 #~ msgid "Authors: {0}"
 #~ msgstr "Autores: {0}"
@@ -33348,5 +33643,4 @@
 #~ msgstr "Borrar a capa seleccionada."
 
-#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Pila de Comandos: {0}"
@@ -33358,9 +33652,7 @@
 #~ msgstr "Non se atoparon imaxes con marcas de tempo lexibles."
 
-#, java-format
 #~ msgid "GPS start: {0}"
 #~ msgstr "Inicio GPS: {0}"
 
-#, java-format
 #~ msgid "GPS end: {0}"
 #~ msgstr "Fin GPS: {0}"
@@ -33371,5 +33663,4 @@
 #~ msgstr[1] "imaxes"
 
-#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} dentro da traza."
@@ -33430,12 +33721,15 @@
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you load\n"
+#~ "Parameters are read in the order they are specified, so make sure you "
+#~ "load\n"
 #~ "some data before --selection"
 #~ msgstr ""
-#~ "Os parámetros son lidos na orde que son especificados polo que, asegúrate\n"
+#~ "Os parámetros son lidos na orde que son especificados polo que, "
+#~ "asegúrate\n"
 #~ "que cargas algo de información antes de --selection"
 
 #~ msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-#~ msgstr "En lugar de --download=<límites> debes especificar osm://<límites>\n"
+#~ msgstr ""
+#~ "En lugar de --download=<límites> debes especificar osm://<límites>\n"
 
 #~ msgid "Error while parsing"
@@ -33454,13 +33748,10 @@
 #~ msgstr "Selecciona primeiro un marcador."
 
-#, java-format
 #~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
 #~ msgstr "Non se puido ler a hora \"{0}\" do punto {1} x {2}"
 
-#, java-format
 #~ msgid "No time for point {0} x {1}"
 #~ msgstr "Non hai hora para o punto {0} x {1}"
 
-#, java-format
 #~ msgid "current delta: {0}s"
 #~ msgstr "delta actual: {0}s"
@@ -33472,9 +33763,7 @@
 #~ msgstr "<p>Gracias pola túa comprensión</p>"
 
-#, java-format
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "Usar ó axuste preestablecido \"{0}\" do grupo \"{1}\""
 
-#, java-format
 #~ msgid "Use preset ''{0}''"
 #~ msgstr "Usar axuste preestablecido \"{0}\""
@@ -33496,5 +33785,4 @@
 #~ msgstr "ID de nodo mal formada"
 
-#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -33506,16 +33794,14 @@
 #~ " {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 ""
 #~ "O engadido {0} semella estar estropeado ou non puido ser descargado "
 #~ "automáticamente."
 
-#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Engadido non atopado: {0}"
 
-#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "O engadido require a actualización de JOSM: {0}."
@@ -33526,14 +33812,13 @@
 #~ msgstr ""
 #~ "(Podes cambiar o número de días tras os cales aparecerá esta "
-#~ "advertencia<br>establecendoos coa opción de configuración "
-#~ "'pluginmanager.warntime'.)"
-
-#, java-format
+#~ "advertencia<br>establecendoos coa opción de configuración 'pluginmanager."
+#~ "warntime'.)"
+
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Non se puido descargar o engadido: {0} de {1}"
 
 #~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission to "
-#~ "overwrite the existing ones."
+#~ "Activating the updated plugins failed. Check if JOSM has the permission "
+#~ "to overwrite the existing ones."
 #~ msgstr ""
 #~ "A activacción dos engadidos actualizados fallou. Comproba se JOSM ten "
@@ -33544,6 +33829,6 @@
 #~ "about the problem."
 #~ msgstr ""
-#~ "O engadido non puido ser eliminado. Por favor, comentalle o problema á xente "
-#~ "que che propocionou JOSM."
+#~ "O engadido non puido ser eliminado. Por favor, comentalle o problema á "
+#~ "xente que che propocionou JOSM."
 
 #~ msgid "Download missing plugins"
@@ -33556,5 +33841,4 @@
 #~ msgstr "Borrar e Descargar"
 
-#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -33574,9 +33858,7 @@
 #~ msgstr "Abrir ficheiro (como datos gps en bruto, se é .gpx)"
 
-#, java-format
 #~ msgid "The date in file \"{0}\" could not be parsed."
 #~ msgstr "A data no ficheiro \"{0}\" non puido ser analizada."
 
-#, java-format
 #~ msgid "There is no EXIF time within the file \"{0}\"."
 #~ msgstr "Non hai hora EXIF no ficheiro \"{0}\"."
@@ -33590,6 +33872,6 @@
 #~ msgstr ""
 #~ "As fontes (URL ou nome de ficheiro) dos ficheiros de definición de "
-#~ "etiquetado preestablecido. Ver "
-#~ "http://josm.openstreetmap.de/wiki/TaggingPresets para obter axuda."
+#~ "etiquetado preestablecido. Ver http://josm.openstreetmap.de/wiki/"
+#~ "TaggingPresets para obter axuda."
 
 #~ msgid "Lambert Zone 2 cache file (.2)"
@@ -33623,5 +33905,4 @@
 #~ msgstr "So se poden editar páxinas de axuda da Axuda en liña de JOSM"
 
-#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Erro durante a carga da páxina {0}"
@@ -33637,6 +33918,6 @@
 #~ "elements have a history."
 #~ msgstr ""
-#~ "Por favor, selecciona polo menos un nodo, via ou relación. Só os elementos "
-#~ "xa subidos teñen historial."
+#~ "Por favor, selecciona polo menos un nodo, via ou relación. Só os "
+#~ "elementos xa subidos teñen historial."
 
 #~ msgid "Merge Anyway"
@@ -33645,5 +33926,6 @@
 #~ msgid "Please select one or more closed ways of at least four nodes."
 #~ msgstr ""
-#~ "Por favor, selecciona unha ou máis vias pechadas de, polo menos, catro nodos."
+#~ "Por favor, selecciona unha ou máis vias pechadas de, polo menos, catro "
+#~ "nodos."
 
 #~ msgid "Only two nodes allowed"
@@ -33660,10 +33942,10 @@
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data layer?"
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
 #~ msgstr ""
-#~ "Non se atoparon datos para actualizar. Abriches ou descargaches xa unha capa "
-#~ "de datos?"
-
-#, java-format
+#~ "Non se atoparon datos para actualizar. Abriches ou descargaches xa unha "
+#~ "capa de datos?"
+
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
@@ -33685,9 +33967,7 @@
 #~ msgstr "Erros durante a descarga"
 
-#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "Contacto {0}..."
 
-#, java-format
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "Non se puido ler dende a URL: \"{0}\""
@@ -33697,22 +33977,21 @@
 
 #~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this as "
-#~ "a bug."
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
 #~ msgstr ""
-#~ "Erro Interno: non se poden comprobar as condicións para ningunha capa. Por "
-#~ "favor, informa disto como un erro."
-
-#, java-format
+#~ "Erro Interno: non se poden comprobar as condicións para ningunha capa. "
+#~ "Por favor, informa disto como un erro."
+
 #~ msgid "Parsing error in URL: \"{0}\""
 #~ msgstr "Erro de análise na URL: \"{0}\""
 
 #~ msgid ""
-#~ "You are about to delete nodes outside of the area you have "
-#~ "downloaded.<br>This can cause problems because other objects (that you don't "
-#~ "see) might use them.<br>Do you really want to delete?"
+#~ "You are about to delete nodes outside of the area you have downloaded."
+#~ "<br>This can cause problems because other objects (that you don't see) "
+#~ "might use them.<br>Do you really want to delete?"
 #~ msgstr ""
-#~ "Estás a punto de borrar nodos que se atopan fora da área que "
-#~ "descargaches.<br>Isto pode causar problemas porque outros obxectos (que non "
-#~ "ves) poden estar usandoos.<br>Queres borralos realmente?"
+#~ "Estás a punto de borrar nodos que se atopan fora da área que descargaches."
+#~ "<br>Isto pode causar problemas porque outros obxectos (que non ves) poden "
+#~ "estar usandoos.<br>Queres borralos realmente?"
 
 #~ msgid "Conflicting relation"
@@ -33725,5 +34004,4 @@
 #~ msgstr "Mover"
 
-#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Non se pode abrir o directorio de preferencias: {0}"
@@ -33738,13 +34016,10 @@
 #~ msgstr "verdadeiro"
 
-#, java-format
 #~ msgid "Error: {0}"
 #~ msgstr "Erro: {0}"
 
-#, java-format
 #~ msgid "Warning: {0}"
 #~ msgstr "Advertencia: {0}"
 
-#, java-format
 #~ msgid "multipolygon way ''{0}'' is not closed."
 #~ msgstr "a vía multipoligonal \"{0}\" non está pechada."
@@ -33753,5 +34028,4 @@
 #~ msgstr "A vía de estilo de área non está pechada."
 
-#, java-format
 #~ msgid "Way ''{0}'' with less than two points."
 #~ msgstr "Vía \"{0}\" con menos de dous puntos."
@@ -33766,9 +34040,7 @@
 #~ msgstr "Non se atoparon vias \"desde\"."
 
-#, java-format
 #~ msgid "Unknown role ''{0}''."
 #~ msgstr "Papel \"{0}\" descoñecido."
 
-#, java-format
 #~ msgid "Unknown member type for ''{0}''."
 #~ msgstr "Tipo de membro descoñecido para \"{0}\"."
@@ -33780,17 +34052,13 @@
 #~ msgstr "Non se poden ler resultados de busca de lugar dende o servidor"
 
-#, java-format
 #~ msgid "No useful role ''{0}'' for Way ''{1}''."
 #~ msgstr "Non hai un rol ''{0}'' útil para a Vía ''{1}'.'"
 
-#, java-format
 #~ msgid "Intersection between ways ''{0}'' and ''{1}''."
 #~ msgstr "Intersección entre as vías ''{0}'' e ''{1}''."
 
-#, java-format
 #~ msgid "Inner way ''{0}'' is outside."
 #~ msgstr "A vía interior ''{0}'' está fóra."
 
-#, java-format
 #~ msgid "Style for restriction {0} not found."
 #~ msgstr "Non se atopou o estilo para a restrición {0}"
@@ -33811,5 +34079,4 @@
 #~ msgstr "Abrir imaxes con AgPifoJ..."
 
-#, java-format
 #~ msgid "Checking whether node {0} is gone ..."
 #~ msgstr "Comprobando se o nodo {0} falta ..."
@@ -33818,27 +34085,26 @@
 #~ msgstr "Desfacendo o borrado da relación.."
 
-#, java-format
 #~ msgid "Checking whether primitive {0} is gone ..."
 #~ msgstr "Comprobando se a primitiva {0} falta ..."
 
-#, java-format
 #~ msgid ""
-#~ "<html>The OSM primitive with id <strong>{0}</strong> has been deleted<br>on "
-#~ "the server by another mapper.<br><br>Click <strong>{1}</strong> to keep your "
-#~ "primitive and ignore the deleted state.<br>Your primitive will be assigend a "
-#~ "new id.<br>Click <strong>{2}</strong> to accept the state on the server and "
-#~ "to delete your primitive.<br>Click <strong>{3}</strong> to cancel.<br>"
+#~ "<html>The OSM primitive with id <strong>{0}</strong> has been "
+#~ "deleted<br>on the server by another mapper.<br><br>Click <strong>{1}</"
+#~ "strong> to keep your primitive and ignore the deleted state.<br>Your "
+#~ "primitive will be assigend a new id.<br>Click <strong>{2}</strong> to "
+#~ "accept the state on the server and to delete your primitive.<br>Click "
+#~ "<strong>{3}</strong> to cancel.<br>"
 #~ msgstr ""
-#~ "<html>A primitiva OSM coa id <strong>{0}</strong> foi borrada<br>no servidor "
-#~ "por outro mapeador.<br><br>Fai click en <strong>{1}</strong> para conservar "
-#~ "a túa primitiva e ignorar o estado de borrado.<br>Á túa primitiva seralle "
-#~ "asignado un novo id.<br>Fai click en <strong>{2}</strong> para aceptar o "
-#~ "estado do servidor e borrar a túa primitiva.<br>Fai click en "
-#~ "<strong>{3}</strong> para cancelar.<br>"
-
-#, java-format
+#~ "<html>A primitiva OSM coa id <strong>{0}</strong> foi borrada<br>no "
+#~ "servidor por outro mapeador.<br><br>Fai click en <strong>{1}</strong> "
+#~ "para conservar a túa primitiva e ignorar o estado de borrado.<br>Á túa "
+#~ "primitiva seralle asignado un novo id.<br>Fai click en <strong>{2}</"
+#~ "strong> para aceptar o estado do servidor e borrar a túa primitiva."
+#~ "<br>Fai click en <strong>{3}</strong> para cancelar.<br>"
+
 #~ msgid ""
-#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for individual "
-#~ "update. Please reduce the selection<br>to max. {1} primitives.</html>"
+#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
+#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
+#~ "</html>"
 #~ msgstr ""
 #~ "<html>Hai <strong>{0}</strong> primitivas <br>seleccionadas para "
@@ -33858,5 +34124,4 @@
 #~ msgstr "Actualizando primitiva"
 
-#, java-format
 #~ msgid ""
 #~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
@@ -33865,6 +34130,6 @@
 #~ msgstr ""
 #~ "<html>A subida <strong>fallou</strong> porque a primitiva que intentou "
-#~ "borrar<br>no servidor xa está borrada.<br><br>A mensaxe de erro "
-#~ "é:<br>{0}</html>"
+#~ "borrar<br>no servidor xa está borrada.<br><br>A mensaxe de erro é:<br>{0}"
+#~ "</html>"
 
 #~ msgid "Conflict detected"
@@ -33880,13 +34145,11 @@
 #~ msgstr "Número de parámetros incorrecto para o operador nodes."
 
-#, java-format
 #~ msgid ""
 #~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
 #~ "nodes or range, for example nodes:10-20"
 #~ msgstr ""
-#~ "Valor incorrecto do operador nodes: {0}. O operador nodes espera un número "
-#~ "de nodos ou un rango, por exemplo nodes:10-20"
-
-#, java-format
+#~ "Valor incorrecto do operador nodes: {0}. O operador nodes espera un "
+#~ "número de nodos ou un rango, por exemplo nodes:10-20"
+
 #~ msgid "Incorrect value of id operator: {0}. Number is expected."
 #~ msgstr "Valor incorrecto do operador id: {0}. Espérase un número."
@@ -33901,5 +34164,4 @@
 #~ msgstr "vías"
 
-#, java-format
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Solucionar {0} conflitos en {1} obxectos"
@@ -33908,5 +34170,4 @@
 #~ msgstr "Combinando conflitos"
 
-#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -33930,29 +34191,23 @@
 #~ "datos"
 
-#, java-format
 #~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr "Páxina de axuda perdida. Créea en <A HREF=\"{0}\">inglés</A>."
 
-#, java-format
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
 #~ msgstr ""
-#~ "Páxina de axuda perdida. Créea en <A HREF=\"{0}\">inglés</A> ou <A "
-#~ "HREF=\"{1}\">galego</A>."
-
-#, java-format
+#~ "Páxina de axuda perdida. Créea en <A HREF=\"{0}\">inglés</A> ou <A HREF="
+#~ "\"{1}\">galego</A>."
+
 #~ msgid "Parameter ''{0}'' must not be null."
 #~ msgstr "o parámetro \"{0}\" debe non ser nulo"
 
-#, java-format
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "valor retornado non esperado. Obtívose {0}"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
 #~ msgstr "Requírese o parámetro {0} > 0. Obtívose {1}."
 
-#, java-format
 #~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 #~ msgstr "o parámetro \"{0}\" non é unha clase aceptable, obtivose \"{1}\""
@@ -33964,5 +34219,4 @@
 #~ msgstr "Non hai unha versión válida con data \"{0}\" en este historial"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 #~ msgstr "esperábase o parámetro \"{0}\" no rango 0..{1}, obtívose {2}"
@@ -33990,30 +34244,26 @@
 #~ msgstr "C"
 
-#, java-format
 #~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
 #~ msgstr "Erro na sintáxis do patrón: O patrón {0} de {1} non é válido!"
 
-#, java-format
 #~ msgid "Style for inner way ''{0}'' equals multipolygon."
 #~ msgstr "O estilo da vía interior \"{0}\" é igual á do multipolígono"
 
-#, java-format
 #~ msgid "Style for outer way ''{0}'' mismatches."
 #~ msgstr "O estilo da vía exterior \"{0}\" non coincide."
 
-#, java-format
 #~ msgid ""
 #~ "<html>There are {0} primitives in your local dataset which<br>might be "
 #~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
-#~ "to check the state of these primitives<br>on the server.<br>Click "
+#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
+#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
 #~ "<strong>{2}</strong> to ignore.<br></html>"
 #~ msgstr ""
-#~ "<html>Hay {0} primitivas no seu conxunto de datos local que<br>poden estar "
-#~ "borradas no servidor. Si posteriormente trata de borralas ou "
-#~ "<br>actualizalas probablemente o servidor informará de un "
-#~ "<br>conflicto.<br><br>Pulse <strong>{1}</strong> para comprobar o estado de "
-#~ "estas primitivas<br>no servidor-<br>Pulse <strong>{2}</strong> para "
-#~ "ignorar.<br></html>"
+#~ "<html>Hay {0} primitivas no seu conxunto de datos local que<br>poden "
+#~ "estar borradas no servidor. Si posteriormente trata de borralas ou "
+#~ "<br>actualizalas probablemente o servidor informará de un <br>conflicto."
+#~ "<br><br>Pulse <strong>{1}</strong> para comprobar o estado de estas "
+#~ "primitivas<br>no servidor-<br>Pulse <strong>{2}</strong> para ignorar."
+#~ "<br></html>"
 
 #~ msgid "Apply also for children"
Index: /applications/editors/josm/i18n/po/he.po
===================================================================
--- /applications/editors/josm/i18n/po/he.po	(revision 21970)
+++ /applications/editors/josm/i18n/po/he.po	(revision 21971)
@@ -8,7 +8,7 @@
 "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:11+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2010-06-23 22:47+0200\n"
+"PO-Revision-Date: 2010-06-19 21:08+0000\n"
+"Last-Translator: ilangut <Unknown>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-06-15 16:23+0000\n"
+"X-Launchpad-Export-Date: 2010-06-23 20:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -23,5 +23,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
@@ -93,5 +93,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
@@ -101,5 +101,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:470
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
-msgstr ""
+msgstr "הפרמטר \"downloadgps\" אינו מקבל שמות קובץ או כתובות URL של קבצים"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:538
@@ -250,5 +250,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
@@ -271,5 +271,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
@@ -277,6 +277,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
@@ -285,4 +287,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
@@ -320,6 +324,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 ""
 
@@ -343,9 +347,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
@@ -405,4 +409,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
@@ -442,5 +447,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 "מידע"
@@ -649,5 +654,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
@@ -662,5 +667,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 "מחק"
@@ -909,4 +914,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 ""
@@ -917,4 +923,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 ""
@@ -1464,6 +1471,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
@@ -1490,4 +1497,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
@@ -1496,6 +1505,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 "שגיאה"
@@ -1610,6 +1619,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 "הצג דו\"ח מצב עם מידע שימושי שיכול ליהיות מצורף לבאגים"
 
@@ -1645,8 +1653,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 ""
@@ -1655,5 +1665,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 ""
@@ -1661,16 +1672,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 "בחר לפחות דרך אחת לפישוט"
@@ -1679,13 +1695,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 ""
@@ -1694,8 +1713,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"
@@ -1705,4 +1726,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)"
@@ -1830,6 +1852,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 "* נקודה אחת המשותפת ליותר מדרך אחת ואחת מהדרכים הללו, או"
 
@@ -1895,9 +1916,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)"
@@ -1914,5 +1935,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
@@ -1976,5 +1997,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 "אין שינויים להעלאה."
@@ -1992,14 +2012,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 ""
@@ -2254,5 +2274,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
@@ -2369,6 +2389,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 ""
 "גרור את ראש הנגינה ושחרר ליד הרצועה המבוקשת לניגון שמע ממנה; SHIFT+שחרור "
@@ -2499,5 +2519,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."
@@ -2615,6 +2635,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 ""
 
@@ -2879,10 +2899,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
@@ -3004,5 +3028,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
@@ -3080,7 +3104,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 ""
 "אתה עומד למחוק נקודות מחוץ לשטח שהורדת.<br>זה עלול לגרום לבעיות כיוון שעצמים "
@@ -3128,11 +3152,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"
@@ -3141,5 +3165,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 #, java-format
 msgid ""
@@ -3148,5 +3172,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}"
@@ -3352,6 +3376,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 ""
 
@@ -3434,5 +3458,5 @@
 #. *
 #. * the decimal format 999.999
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3441,5 +3465,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3448,5 +3472,5 @@
 #. *
 #. * coordinates East/North
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3493,4 +3517,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}"
@@ -3502,29 +3529,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 ""
 
@@ -3603,19 +3624,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 ""
@@ -3624,5 +3645,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 "
@@ -3630,5 +3651,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 "נבחר"
@@ -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 ""
 
@@ -3930,5 +3949,5 @@
 #. color tiger_data
 #. </rule>
-#. 
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -3938,5 +3957,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -3945,5 +3964,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -3952,5 +3971,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -3959,5 +3978,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -3966,5 +3985,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -3973,9 +3992,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--annotation tags -->
-#. 
+#.
 #. <!--"work in progress" tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="building"/>
@@ -3984,5 +4003,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 "בניין"
@@ -4069,5 +4088,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
@@ -4293,5 +4312,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
@@ -4300,4 +4319,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
@@ -4497,5 +4517,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
@@ -4534,6 +4554,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 ""
 
@@ -4564,5 +4584,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"
@@ -4571,5 +4591,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"
@@ -4578,5 +4598,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"
@@ -4794,6 +4814,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 "העתק את האלמנטים הנבחרים שלהם לסוף רשימת האלמנטים הממוזגים"
 
@@ -4877,6 +4896,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 ""
 
@@ -4884,6 +4903,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 ""
 
@@ -4934,6 +4953,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 ""
 
@@ -5150,10 +5169,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"
@@ -5162,10 +5183,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
@@ -5247,4 +5270,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 "כלום"
@@ -5461,7 +5485,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 ""
 
@@ -5486,6 +5510,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 ""
 
@@ -5531,5 +5554,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
@@ -5602,10 +5625,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 ""
 
@@ -5628,5 +5650,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
@@ -5634,5 +5656,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 "הוסף"
@@ -5681,5 +5703,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 "היסטוריה"
@@ -5899,10 +5921,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 ""
@@ -5940,6 +5962,5 @@
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
-msgstr ""
-"סגור את הפאנל. ניתן לפתוח אותו מחדש בעזרת הכפתורים בסרגל הכלים השמאלי."
+msgstr "סגור את הפאנל. ניתן לפתוח אותו מחדש בעזרת הכפתורים בסרגל הכלים השמאלי."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
@@ -7358,6 +7379,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 ""
 
@@ -7381,8 +7402,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 ""
 
@@ -7502,9 +7523,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."
@@ -7513,23 +7534,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 "<שונה>"
 
-#: ../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 "לשנות ערכים?"
 
-#: ../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"
@@ -7538,5 +7559,5 @@
 msgstr[1] "שנה תכונות של עד {0} עצמים"
 
-#: ../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."
@@ -7545,77 +7566,77 @@
 msgstr[1] "זה ישנה עד {0} עצמים"
 
-#: ../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 "נא בחר מפתח"
 
-#: ../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 "נא בחר ערך"
 
-#: ../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 "תכונות\\חברויות"
 
-#: ../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 "תכונות לעצמים שנבחרו."
 
 #. 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 "תכונות: {0} \\ חברויות: {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 "תכונות \\ חברויות"
 
-#: ../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 "שנה יחס"
 
-#: ../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 "באמת מחק את הבחירה מהיחס {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 "מחק את המפתח הנבחר בכל הפריטים"
 
-#: ../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 "הוסף מצד מפתח/ערך לכל הפריטים"
 
-#: ../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 "ערוך את הערך של המפתח הנבחר עבור כל הפריטים"
 
-#: ../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 ""
@@ -7730,6 +7751,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 ""
 
@@ -7747,6 +7768,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 ""
 
@@ -7901,7 +7922,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 ""
 
@@ -8234,7 +8254,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 ""
 
@@ -8375,6 +8394,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 ""
 
@@ -8384,6 +8403,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 ""
 
@@ -8657,9 +8676,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 ""
 
@@ -8674,8 +8692,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 ""
 
@@ -8921,5 +8938,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 ""
@@ -8927,6 +8944,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 ""
 
@@ -9011,6 +9027,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] ""
@@ -9024,6 +9040,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 "
@@ -9249,5 +9265,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9273,6 +9289,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 ""
 
@@ -9327,6 +9342,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 ""
 
@@ -9380,7 +9395,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 ""
 
@@ -9390,5 +9405,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9404,5 +9419,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..."
@@ -9413,6 +9428,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 ""
 
@@ -9630,7 +9644,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 ""
 
@@ -9656,7 +9670,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 ""
 
@@ -9720,6 +9734,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 ""
 "<html>העלאת קובץ נתוני GPS לא מעובדים נחשבת מזיקה.<br>אם אתה רוצה להעלות "
@@ -9786,6 +9800,6 @@
 "wish<br>to continue?</html>"
 msgstr ""
-"<html>הפעולה הזו דורשת {0} בקשות<br>הורדה נפרדות. האם אתה "
-"רוצה<br>להמשיך?</html>"
+"<html>הפעולה הזו דורשת {0} בקשות<br>הורדה נפרדות. האם אתה רוצה<br>להמשיך?</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
@@ -9901,6 +9915,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 ""
 
@@ -9960,7 +9974,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 ""
 
@@ -10539,6 +10553,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 ""
 
@@ -10560,8 +10574,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 ""
 
@@ -10681,6 +10695,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 ""
 
@@ -10790,6 +10804,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 ""
 
@@ -10923,8 +10936,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 ""
 
@@ -11007,8 +11020,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 ""
 
@@ -11035,7 +11048,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 ""
 
@@ -11086,5 +11099,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 "נא בחר את השורה למחיקה."
@@ -11437,6 +11450,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 "צייר את חצי הכיוון תוך שימוש בטבלת חיפוש במקום חישובים מסובכים."
 
@@ -11495,6 +11507,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 ""
 
@@ -11566,5 +11577,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 "אפשר ברירות מחדל מובנות"
@@ -11584,6 +11595,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>:"
@@ -11708,6 +11718,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 ""
 
@@ -11720,9 +11730,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 ""
 
@@ -12019,6 +12029,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 ""
 
@@ -12029,5 +12039,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 ""
@@ -12037,18 +12047,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 ""
@@ -12057,5 +12067,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 ""
@@ -12064,5 +12074,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 ""
@@ -12071,9 +12081,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 ""
@@ -12182,6 +12192,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 ""
 
@@ -12203,6 +12213,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 ""
 
@@ -12280,6 +12290,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 ""
 
@@ -12295,6 +12304,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 ""
 
@@ -12388,6 +12396,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 ""
 
@@ -12520,4 +12528,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 "שנה תכונות"
@@ -12683,5 +12692,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
@@ -12701,5 +12710,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}''"
@@ -12864,6 +12873,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 ""
 
@@ -12980,10 +12988,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 ""
@@ -12991,69 +12999,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}."
@@ -13231,4 +13239,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})"
@@ -13248,6 +13257,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 ""
 
@@ -13275,6 +13284,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 ""
 
@@ -13316,6 +13325,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 ""
 
@@ -13749,6 +13757,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 +13962,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 +14027,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 +14108,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 +14115,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 +14123,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 +14131,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 +14152,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 +14221,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 +14232,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 +14264,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 ""
 
@@ -14764,6 +14770,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>"
@@ -14790,6 +14796,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"
@@ -14827,6 +14833,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"
@@ -14842,7 +14848,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"
@@ -14893,9 +14899,29 @@
 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 "מבנים"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#, fuzzy
+msgid "Rotate crosshair"
+msgstr "סובב ימינה"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#, fuzzy
+msgid "Advanced settings"
+msgstr "מאפיינים מתקדמים"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#, fuzzy
+msgid "Building tag:"
+msgstr "מבנה"
+
+#: ../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"
@@ -14904,35 +14930,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 "מבנה ציבור"
+
+#: ../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 ""
 
@@ -15107,7 +15142,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--waterway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15117,5 +15152,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15125,5 +15160,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15139,5 +15174,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15147,5 +15182,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15153,8 +15188,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 "מים"
@@ -15176,5 +15211,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15183,5 +15218,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15190,5 +15225,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15197,5 +15232,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15204,5 +15239,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15211,10 +15246,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 "כתובת"
@@ -15243,11 +15278,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 ""
 
@@ -15673,6 +15707,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 "שכבה ריקה"
@@ -15855,4 +15889,52 @@
 msgstr "לא נמצאה שכבת נתוני GPX"
 
+#: ../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 "ערוך גן חיות"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#, fuzzy
+msgid "Name:"
+msgstr "שם"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#, fuzzy
+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 "האם אתה בטוח?"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
+#, fuzzy
+msgid "New tool..."
+msgstr "תפקיד חדש"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
+#, fuzzy
+msgid "Install"
+msgstr "תעשייתי"
+
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
 msgid "Position only"
@@ -16119,5 +16201,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#. 
+#.
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16238,6 +16320,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 ""
 
@@ -16257,7 +16338,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 ""
 "הדיוק של פישוט קו דאגלס-פאוקר, נמדד במעלות. <br>ערכים נמוכים נותנים יותר "
@@ -16566,6 +16646,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 ""
 
@@ -16675,6 +16754,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 ""
 
@@ -16726,6 +16804,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 ""
 
@@ -17091,5 +17168,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}"
@@ -17139,4 +17216,43 @@
 #, java-format
 msgid "Revert changeset #{0}"
+msgstr ""
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:78
+#, fuzzy
+msgid "Road Sign Plugin"
+msgstr "טעינת תוספים"
+
+#: ../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 "לא ניתן לשנות את שם הקובץ ''{0}''"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
+#, fuzzy, java-format
+msgid "Error parsing tagging preset from ''{0}'':\n"
+msgstr ""
+"שגיאה באתחול בדיקה {0}:\n"
+" {1}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:104
+#, fuzzy, java-format
+msgid "Sign {0}"
+msgstr "בחירה: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:111
+#, java-format
+msgid "Additional sign {0}"
 msgstr ""
 
@@ -17244,4 +17360,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 "פשט דרך"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
+#, fuzzy
+msgid "Delete unnecessary nodes from an area."
+msgstr "מחק נקודות מיותרות מדרך"
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
 msgid "Slippy Map"
@@ -18033,6 +18160,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 ""
 
@@ -18118,8 +18245,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 ""
 
@@ -18173,8 +18300,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 ""
 
@@ -18286,6 +18413,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 ""
 
@@ -18293,6 +18420,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 ""
 
@@ -18943,7 +19070,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 ""
 
@@ -19139,9 +19265,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 "שטח"
@@ -19237,11 +19363,146 @@
 msgstr "{0},..."
 
-#: ../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
+#, fuzzy, java-format
+msgid "{0} {1}% of GPS track"
+msgstr "{0} מורכב ממסלול {1}"
+
+#: ../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 "ייבא שמע"
+
+#: ../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 "הסר"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
+#, fuzzy
+msgid "removes current video from layer"
+msgstr "הסר תמונה משכבה"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
+#, fuzzy
+msgid "play/pause"
+msgstr "נגן\\השהה"
+
+#: ../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 "רקע"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
+#, fuzzy
+msgid "jumps n sec back"
+msgstr "עבור אחורה."
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "forward"
+msgstr "העבר"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "jumps n sec forward"
+msgstr "קפוץ הלאה"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
+#, fuzzy
+msgid "faster"
+msgstr "מהר יותר"
+
+#: ../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 "לאט יותר"
+
+#: ../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 "מרכז את שכבת LiveGPS למיקום הנוכחי באופן רצוף"
+
+#. 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
+#, fuzzy
+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
+#, fuzzy
+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 "שכבה"
+
+#: ../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 ""
 
@@ -19454,28 +19715,28 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
 msgid "Automatic downloading"
 msgstr "הורדה אוטומטית"
 
-#: ../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 ""
@@ -19486,113 +19747,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 "הורד משטחים גלויים"
 
-#: ../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 "שנה רזולוציה"
 
-#: ../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 "שמור שכבת WMS לקובץ"
 
-#: ../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 "טען שכבת WMS מקובץ"
 
-#: ../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 "גירסת קובץ WMS לא נתמכת; נמצא {0}, צפי {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 "פתח שכבת WMS ריקה לטעינת נתונים מקובץ"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
 msgid "WMS Plugin Preferences"
 msgstr "מאפייני תוסף WMS"
 
-#: ../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 ""
 
-#: ../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 "שם תפריט"
 
-#: ../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 "כתובת 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 "כתובת WMS (ברירת מחדל)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:86
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
 msgid "Enter a menu name and WMS URL"
 msgstr "הזן שם תפריט וכתובת 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 ""
@@ -19608,4 +19869,8 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
 msgid "% of north:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186
+msgid "Simultaneous connections"
 msgstr ""
 
@@ -19618,7 +19883,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
@@ -19627,6 +19892,6 @@
 "area, or use planet.osm"
 msgstr ""
-"ביקשת יותר מידי נקודות (מוגבל ל 50,000). בקש שטח קטן יותר או השתמש ב "
-"planet.osm"
+"ביקשת יותר מידי נקודות (מוגבל ל 50,000). בקש שטח קטן יותר או השתמש ב planet."
+"osm"
 
 #. OSM server message
@@ -19668,8 +19933,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 "יער"
@@ -19686,7 +19951,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--boundary tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -19696,5 +19961,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -19737,5 +20002,5 @@
 #. color boundary
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -19745,5 +20010,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -19753,5 +20018,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -19761,15 +20026,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 "גבול"
@@ -19785,5 +20050,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -19792,7 +20057,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--route tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -19802,5 +20067,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -19810,5 +20075,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -19818,5 +20083,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -19826,5 +20091,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -19834,5 +20099,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -19842,5 +20107,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -19850,12 +20115,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 ""
@@ -20132,21 +20397,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 "
@@ -20156,10 +20420,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."
@@ -20167,5 +20431,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 "
@@ -20175,15 +20439,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 "
@@ -20192,5 +20456,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 "
@@ -20200,15 +20464,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"
@@ -20216,5 +20480,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."
@@ -20222,5 +20486,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 "
@@ -20229,5 +20493,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 "
@@ -20236,10 +20500,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."
@@ -20247,15 +20511,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 "
@@ -20264,10 +20529,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 "
@@ -20276,15 +20548,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 "
@@ -20294,10 +20566,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). "
@@ -20306,5 +20578,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) "
@@ -20313,5 +20585,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:89
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20320,10 +20592,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 "
@@ -20332,5 +20604,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 "
@@ -20340,5 +20612,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:97
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20347,15 +20619,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 "
@@ -20364,5 +20636,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:105
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21252,10 +21524,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 "כיכר"
@@ -21392,8 +21664,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"/>
@@ -21603,5 +21875,5 @@
 #. color motorroad
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21611,5 +21883,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21628,5 +21900,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21636,5 +21908,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21653,5 +21925,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -21661,5 +21933,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -21678,5 +21950,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -21686,5 +21958,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -21699,5 +21971,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -21715,8 +21987,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 "מגורים"
@@ -21731,5 +22003,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -21738,5 +22010,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--public_transport tags -->
 #. <rule>
@@ -21746,10 +22018,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 "שירות"
@@ -21764,5 +22036,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -21771,5 +22043,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -21779,10 +22051,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 "בנייה"
@@ -22788,9 +23060,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 "ביצה"
@@ -23120,5 +23392,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -23128,5 +23400,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -23136,5 +23408,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -23144,5 +23416,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -23152,5 +23424,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -23160,5 +23432,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -23168,5 +23440,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -23177,5 +23449,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -23183,9 +23455,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 ""
@@ -24595,5 +24867,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24603,5 +24875,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24611,5 +24883,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24619,5 +24891,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -24981,7 +25253,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--sport tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -24991,5 +25263,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -24999,5 +25271,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -25007,5 +25279,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -25015,5 +25287,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -25023,5 +25295,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -25031,5 +25303,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -25039,5 +25311,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -25047,5 +25319,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -25055,5 +25327,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -25063,5 +25335,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -25071,5 +25343,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -25079,5 +25351,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -25087,5 +25359,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -25095,5 +25367,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -25103,5 +25375,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -25111,5 +25383,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -25119,5 +25391,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -25127,5 +25399,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -25135,5 +25407,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -25143,5 +25415,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -25151,5 +25423,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -25159,5 +25431,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -25167,5 +25439,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -25175,5 +25447,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -25183,5 +25455,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -25191,5 +25463,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -25199,5 +25471,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -25207,5 +25479,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -25215,5 +25487,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -25223,5 +25495,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -25231,5 +25503,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -25239,5 +25511,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -25247,5 +25519,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -25255,5 +25527,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -25263,5 +25535,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -25271,5 +25543,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -25279,5 +25551,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -25287,5 +25559,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -25295,5 +25567,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -25303,5 +25575,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -25311,5 +25583,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -25319,5 +25591,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -25327,5 +25599,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -25335,5 +25607,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -25343,5 +25615,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -25351,33 +25623,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 "ספורט"
@@ -27055,7 +27327,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--landuse tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -27065,5 +27337,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -27073,5 +27345,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -27081,5 +27353,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -27089,5 +27361,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -27097,5 +27369,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -27105,5 +27377,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -27113,5 +27385,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -27121,12 +27393,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 "ירוק"
@@ -28542,5 +28814,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -28556,5 +28828,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28564,18 +28836,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 -->
@@ -28584,7 +28873,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- cycleway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28594,5 +28883,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28602,5 +28891,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28610,5 +28899,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28618,12 +28907,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 "אופניים"
@@ -28650,5 +28940,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -28664,5 +28954,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -28672,5 +28962,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28679,13 +28969,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"/>
@@ -28696,11 +28994,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 "רגל"
@@ -28719,8 +29018,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 "רכבת תחתית"
@@ -28832,9 +29131,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
@@ -28842,5 +29141,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,
@@ -28850,8 +29149,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
@@ -28865,5 +29164,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#. 
+#.
 #: build/trans_style.java:72
 msgid "standard"
@@ -28871,5 +29170,5 @@
 
 #. mappaint style named "standard"
-#. 
+#.
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -28918,6 +29217,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>
@@ -28997,5 +29296,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -29005,16 +29304,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 "מיושן"
@@ -29025,5 +29324,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -29032,5 +29331,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -29039,5 +29338,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -29053,5 +29352,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -29065,5 +29364,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -29072,5 +29371,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -29079,5 +29378,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -29086,5 +29385,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -29093,5 +29392,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -29100,5 +29399,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -29107,5 +29406,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxweight"/>
@@ -29114,5 +29413,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxheight"/>
@@ -29121,5 +29420,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -29128,5 +29427,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxlength"/>
@@ -29135,5 +29434,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -29142,5 +29441,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="minspeed"/>
@@ -29149,5 +29448,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxstay"/>
@@ -29156,5 +29455,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="toll"/>
@@ -29163,5 +29462,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="barrier"/>
@@ -29338,7 +29637,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- highway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -29352,5 +29651,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -29360,7 +29659,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- tracktype tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -29370,5 +29669,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -29378,5 +29677,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -29386,5 +29685,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -29394,10 +29693,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 ""
@@ -29408,5 +29707,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -29415,5 +29714,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -29423,5 +29722,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -29430,5 +29729,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -29437,5 +29736,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -29444,5 +29743,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -29451,5 +29750,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -29458,5 +29757,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -29465,5 +29764,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -29472,5 +29771,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -29479,5 +29778,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -29486,8 +29785,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 ""
@@ -29498,8 +29797,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 ""
@@ -29510,5 +29809,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -29517,8 +29816,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 ""
@@ -29529,9 +29828,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 ""
@@ -29542,9 +29841,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 "גדת נחל"
@@ -29555,8 +29854,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 "זרם"
@@ -29567,8 +29866,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 ""
@@ -29579,5 +29878,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29586,5 +29885,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29593,5 +29892,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29601,5 +29900,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29608,5 +29907,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29615,5 +29914,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29622,5 +29921,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29630,5 +29929,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29639,5 +29938,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -29647,7 +29946,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--man_made tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -29657,5 +29956,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -29665,5 +29964,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -29673,5 +29972,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -29682,5 +29981,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -29689,5 +29988,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -29697,5 +29996,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -29705,5 +30004,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -29713,5 +30012,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -29721,5 +30020,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -29729,5 +30028,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -29737,5 +30036,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -29745,5 +30044,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -29753,5 +30052,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -29761,18 +30060,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 "מעשה אדם"
@@ -29782,9 +30081,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 ""
@@ -29795,7 +30094,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- railway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -29805,5 +30104,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -29812,5 +30111,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -29820,5 +30119,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -29827,5 +30126,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -29835,5 +30134,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -29843,10 +30142,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 ""
@@ -29857,5 +30156,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -29866,13 +30165,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 ""
@@ -29883,5 +30182,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -29891,5 +30190,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29902,5 +30201,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29908,7 +30207,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 ""
@@ -29919,5 +30218,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -29926,5 +30225,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -29933,5 +30232,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -29940,7 +30239,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aeroway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -29951,9 +30250,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 ""
@@ -29964,8 +30263,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 "מסוף"
@@ -29976,5 +30275,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -29984,8 +30283,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 ""
@@ -29996,8 +30295,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 ""
@@ -30008,5 +30307,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -30015,5 +30314,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -30022,7 +30321,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aerialway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -30032,5 +30331,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -30040,5 +30339,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -30048,5 +30347,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -30056,5 +30355,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -30064,10 +30363,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 ""
@@ -30078,11 +30377,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 "מסלול קל"
@@ -30093,9 +30392,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 "מסלול בינוניים"
@@ -30106,9 +30405,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 "מסלול מתקדמים"
@@ -30119,9 +30418,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 ""
@@ -30132,9 +30431,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 ""
@@ -30145,9 +30444,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 "מסלול מתחילים"
@@ -30158,7 +30457,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--power tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -30168,5 +30467,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -30175,5 +30474,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -30183,5 +30482,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -30191,5 +30490,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -30199,5 +30498,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -30207,5 +30506,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -30215,5 +30514,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -30223,5 +30522,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -30231,5 +30530,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -30239,5 +30538,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -30247,5 +30546,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -30255,5 +30554,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -30263,15 +30562,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 "תחנת כח"
@@ -30281,9 +30580,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 "מזח"
@@ -30294,8 +30593,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 "צינור"
@@ -30305,7 +30604,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--leisure tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -30315,5 +30614,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -30323,5 +30622,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -30331,5 +30630,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -30339,5 +30638,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -30347,5 +30646,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -30355,5 +30654,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -30363,5 +30662,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -30371,5 +30670,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -30379,5 +30678,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -30387,5 +30686,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -30395,5 +30694,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -30403,5 +30702,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -30411,5 +30710,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -30419,5 +30718,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -30427,5 +30726,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -30435,17 +30734,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 "פנאי"
@@ -30455,9 +30754,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 ""
@@ -30467,7 +30766,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--amenity tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -30477,5 +30776,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -30485,5 +30784,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -30493,5 +30792,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -30501,5 +30800,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -30509,5 +30808,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -30517,5 +30816,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -30525,5 +30824,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -30533,5 +30832,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -30541,5 +30840,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -30549,14 +30848,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 ""
@@ -30566,5 +30865,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30574,5 +30873,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30582,5 +30881,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30590,5 +30889,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30598,5 +30897,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30606,5 +30905,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30614,5 +30913,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30622,5 +30921,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30630,5 +30929,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30638,5 +30937,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -30646,5 +30945,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -30654,14 +30953,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 ""
@@ -30671,5 +30970,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -30678,5 +30977,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -30686,5 +30985,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -30693,5 +30992,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -30701,5 +31000,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -30709,5 +31008,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -30717,5 +31016,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -30724,5 +31023,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -30732,5 +31031,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -30740,5 +31039,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -30748,5 +31047,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -30756,5 +31055,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -30763,5 +31062,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -30770,5 +31069,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -30777,5 +31076,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -30784,5 +31083,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -30791,5 +31090,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -30798,5 +31097,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -30805,5 +31104,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -30812,5 +31111,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -30819,5 +31118,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -30826,5 +31125,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -30833,5 +31132,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -30840,5 +31139,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -30847,5 +31146,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -30855,5 +31154,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -30863,5 +31162,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -30871,5 +31170,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -30879,5 +31178,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -30887,5 +31186,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -30895,5 +31194,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -30903,5 +31202,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -30911,5 +31210,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -30919,5 +31218,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -30928,5 +31227,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -30936,5 +31235,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -30944,5 +31243,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -30952,5 +31251,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -30960,5 +31259,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -30968,5 +31267,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -30976,5 +31275,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -30984,5 +31283,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -30992,5 +31291,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -31000,5 +31299,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -31008,5 +31307,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -31016,5 +31315,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -31024,5 +31323,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -31032,5 +31331,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -31040,5 +31339,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -31048,5 +31347,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"/>
@@ -31056,5 +31363,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -31064,5 +31371,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -31072,5 +31379,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -31080,5 +31387,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -31087,27 +31394,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 ""
@@ -31117,5 +31425,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -31125,5 +31433,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -31133,12 +31441,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 ""
@@ -31148,5 +31456,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -31156,5 +31464,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -31164,5 +31472,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -31172,5 +31480,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -31180,5 +31488,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -31188,5 +31496,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -31196,11 +31504,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 "בריאות"
@@ -31210,7 +31518,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--shop tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -31220,5 +31528,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -31228,5 +31536,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -31236,5 +31544,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -31244,5 +31552,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -31252,5 +31560,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -31260,5 +31568,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -31268,5 +31576,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -31276,5 +31584,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -31284,5 +31592,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -31292,5 +31600,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -31300,5 +31608,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -31308,5 +31616,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -31316,5 +31624,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -31324,5 +31632,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -31332,5 +31640,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -31340,5 +31648,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -31348,5 +31656,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -31356,5 +31664,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -31364,5 +31672,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -31372,5 +31680,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -31380,5 +31688,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -31388,5 +31696,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -31396,5 +31704,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -31404,5 +31712,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -31412,5 +31720,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -31420,5 +31728,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -31428,5 +31736,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -31436,5 +31744,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -31444,5 +31752,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -31452,5 +31760,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -31460,5 +31768,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -31468,5 +31776,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -31476,5 +31784,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -31484,5 +31792,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -31492,5 +31800,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -31500,5 +31808,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -31508,5 +31816,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -31516,5 +31824,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -31524,5 +31832,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -31532,5 +31840,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -31540,5 +31848,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -31548,31 +31856,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 "חנות"
@@ -31582,7 +31890,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--tourism tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31592,5 +31900,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31600,5 +31908,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31608,5 +31916,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31616,5 +31924,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31624,5 +31932,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31632,5 +31940,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31640,12 +31948,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 "מלון"
@@ -31655,5 +31963,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -31663,5 +31971,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -31671,5 +31979,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -31679,5 +31987,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -31687,5 +31995,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -31695,5 +32003,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -31704,5 +32012,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -31712,5 +32020,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- information tags -->
 #. <rule>
@@ -31720,5 +32028,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -31728,5 +32036,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -31735,5 +32043,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -31742,13 +32050,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 "תיירות"
@@ -31758,7 +32066,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--historic tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -31768,5 +32076,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -31776,5 +32084,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -31784,5 +32092,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -31792,5 +32100,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -31800,5 +32108,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -31808,5 +32116,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -31816,5 +32124,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -31824,5 +32132,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -31832,13 +32140,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 "היסטורי"
@@ -31848,8 +32156,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 "מחצבה"
@@ -31860,8 +32168,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 ""
@@ -31872,5 +32180,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -31880,8 +32188,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 ""
@@ -31892,8 +32200,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 ""
@@ -31904,6 +32212,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
-#. 
+#.
+#.
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -31913,8 +32221,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 "קמעוני"
@@ -31925,8 +32233,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 "תעשייתי"
@@ -31937,8 +32245,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 ""
@@ -31949,8 +32257,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 ""
@@ -31961,8 +32269,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 ""
@@ -31973,5 +32281,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -31981,7 +32289,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--military tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -31991,5 +32299,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -31999,5 +32307,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -32007,5 +32315,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -32015,11 +32323,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 "צבאי"
@@ -32030,8 +32338,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 "בית עלמין"
@@ -32041,8 +32349,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 "פיסגה"
@@ -32053,9 +32361,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 "קרחון"
@@ -32065,9 +32373,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 "הר געש"
@@ -32077,5 +32385,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -32086,5 +32394,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -32094,5 +32402,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -32102,5 +32410,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -32110,5 +32418,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -32118,12 +32426,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 "טבעי"
@@ -32133,9 +32441,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 ""
@@ -32145,9 +32453,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 ""
@@ -32157,9 +32465,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 ""
@@ -32169,9 +32477,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 "בוץ"
@@ -32181,9 +32489,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 "חוף"
@@ -32194,5 +32502,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?
@@ -32218,5 +32526,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -32227,11 +32535,11 @@
 #. </rule>
 #. -->
-#. 
+#.
 #. <!--name tags -->
-#. 
+#.
 #. <!--preferences tags -->
-#. 
+#.
 #. <!--place tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -32241,5 +32549,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -32249,5 +32557,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -32257,5 +32565,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -32265,5 +32573,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -32273,5 +32581,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -32281,5 +32589,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -32289,5 +32597,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -32297,5 +32605,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -32305,5 +32613,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -32313,5 +32621,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -32321,5 +32629,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -32329,15 +32637,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 "מקום"
@@ -32347,9 +32655,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 ""
@@ -32440,5 +32748,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#. 
+#.
 #. Data type can be:
 #. node        - a node point
@@ -32446,28 +32754,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
@@ -32582,5 +32890,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#. 
+#.
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32593,5 +32901,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>
@@ -32616,6 +32924,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#. 
-#. 
+#.
+#.
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32624,6 +32932,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#. 
-#. 
+#.
+#.
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32638,6 +32946,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
@@ -32651,6 +32959,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
@@ -32670,6 +32978,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#. 
-#. 
+#.
+#.
 #. only for Japan
 #: build/trans_wms.java:39
@@ -32693,6 +33001,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
@@ -32729,5 +33037,4 @@
 #~ msgstr "טען בחירה"
 
-#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "צור קשר עם {0}..."
@@ -32745,5 +33052,4 @@
 #~ msgstr "ארעו התנגשויות במהלך הייבוא."
 
-#, java-format
 #~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
 #~ msgstr "לא ניתן לקרוא מהזמן \"{0}\" מהנקודה {1} x {2}"
@@ -32752,17 +33058,13 @@
 #~ msgstr "לא נמצאו תמונות עם חותמות זמין קריאות."
 
-#, java-format
 #~ msgid "GPS start: {0}"
 #~ msgstr "התחלת GPS: {0}"
 
-#, java-format
 #~ msgid "current delta: {0}s"
 #~ msgstr "הפרש נוכחי: {0}ש'"
 
-#, java-format
 #~ msgid "GPS end: {0}"
 #~ msgstr "סיום GPS: {0}"
 
-#, java-format
 #~ msgid "No time for point {0} x {1}"
 #~ msgstr "אין זמן לנקודה {0} x {1}"
@@ -32771,5 +33073,4 @@
 #~ msgstr "הזן את התאריך המוצג (mm/dd/yyyy HH:MM:SS)"
 
-#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} מתוך הרצועה."
@@ -32778,9 +33079,7 @@
 #~ msgstr "סנכרן שעון"
 
-#, java-format
 #~ msgid "The date in file \"{0}\" could not be parsed."
 #~ msgstr "לא ניתן לנתח את התאריך שבקובץ \"{0}\""
 
-#, java-format
 #~ msgid "There is no EXIF time within the file \"{0}\"."
 #~ msgstr "אין נתוני שעה במבנה EXIF בתוך הקובץ \"{0}\"."
@@ -32794,5 +33093,4 @@
 #~ msgstr "שינויים לא שמורים"
 
-#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "לא ניתן לפתוח את תיקיית ההעדפות: {0}"
@@ -32807,5 +33105,4 @@
 #~ msgstr "הגירסה הפתורה:"
 
-#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -32820,7 +33117,8 @@
 
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want to "
-#~ "combine them?"
-#~ msgstr "לדרכים הנבחרות ישנם יחסים משתנים. האם אתה עדיין מעוניין לשלב ביניהם?"
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
+#~ msgstr ""
+#~ "לדרכים הנבחרות ישנם יחסים משתנים. האם אתה עדיין מעוניין לשלב ביניהם?"
 
 #~ msgid "All the ways were empty"
@@ -32839,11 +33137,10 @@
 #~ msgstr "עזרה מקוונת עבור JOSM"
 
-#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "שגיאה בעת טעינת העמוד {0}"
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still want "
-#~ "to merge them?"
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
 #~ msgstr ""
 #~ "לצמתים האפשריים ישנן קשרי חברות שונים. האם אתה עדיין מעוניין למזג אותם?"
@@ -32856,13 +33153,13 @@
 
 #~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this as "
-#~ "a bug."
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
 #~ msgstr ""
-#~ "שגיאה פנימית: לא ניתן לבדוק תנאים לשכבה שלא נבחרה. אנא דווח על זאת כעל תקלה."
+#~ "שגיאה פנימית: לא ניתן לבדוק תנאים לשכבה שלא נבחרה. אנא דווח על זאת כעל "
+#~ "תקלה."
 
 #~ msgid "Do not show again"
 #~ msgstr "אל תציג שוב"
 
-#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "אנא דווח על {0}"
@@ -32877,6 +33174,6 @@
 
 #~ 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 "נסה לעדכן לגירסא האחרונה של JOSM וכל התוספים לפני דיווח על תקלה."
 
@@ -32917,9 +33214,7 @@
 #~ msgstr "מעלה..."
 
-#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "תוסף לא נמצא: {0}"
 
-#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "תוסף דורש את עדכון JOSM: {0}."
@@ -32943,5 +33238,4 @@
 #~ msgstr "שגיאה בניתוח תשובת השרת."
 
-#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "מחברים: {0}"
@@ -32950,5 +33244,4 @@
 #~ msgstr "שם"
 
-#, java-format
 #~ msgid "Images for {0}"
 #~ msgstr "תמונות עבור {0}"
@@ -32999,5 +33292,4 @@
 #~ msgstr "קבע את השפה."
 
-#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -33045,7 +33337,4 @@
 #~ msgstr "שגיאה בבקשת עדכון"
 
-#~ msgid "Are you sure?"
-#~ msgstr "האם אתה בטוח?"
-
 #~ msgid "Open images with AgPifoJ..."
 #~ msgstr "פותח תמונות ב-AgPifoJ..."
@@ -33072,9 +33361,7 @@
 #~ msgstr "<p>תודה על ההבנה</p>"
 
-#, java-format
 #~ msgid "Error: {0}"
 #~ msgstr "שגיאה: {0}"
 
-#, java-format
 #~ msgid "Warning: {0}"
 #~ msgstr "אזהרה: {0}"
@@ -33090,5 +33377,4 @@
 #~ msgstr "פתח את חלון OpenStreetBugs והפעל את ההורדה האוטומטית"
 
-#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -33104,5 +33390,4 @@
 #~ msgstr "תוויות (ערך ריק מוחק את התווית)"
 
-#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "מצבור פקודות: {0}"
@@ -33157,13 +33442,13 @@
 
 #~ 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 ""
 #~ "הפעלת התוספים המעודכנים נכשלה. בדוק אם יש ל-JOSM הרשאה לדרוס את התוספים "
 #~ "הקיימים."
 
-#, java-format
 #~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded automatically."
+#~ "The plugin {0} seems to be broken or could not be downloaded "
+#~ "automatically."
 #~ msgstr "כנראה שהתוסף {0} אינו תקין או שאי אפשר להוריד אותו בצורה אוטומטית."
 
@@ -33172,12 +33457,10 @@
 #~ "setting the config option 'pluginmanager.warntime'.)"
 #~ msgstr ""
-#~ "(ניתן לשנות את מספר הימים שאחריהם האזהרה תופיע<br>ע\"י קביעת אפשרות התצורה "
-#~ "'pluginmanager.warntime')."
-
-#, java-format
+#~ "(ניתן לשנות את מספר הימים שאחריהם האזהרה תופיע<br>ע\"י קביעת אפשרות "
+#~ "התצורה 'pluginmanager.warntime')."
+
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "לא יכול להוריד תוסף: {0} מ{1}"
 
-#, java-format
 #~ msgid "Way ''{0}'' with less than two points."
 #~ msgstr "הדרך \"{0}\" בת פחות משתי נקודות."
@@ -33187,20 +33470,17 @@
 
 #~ msgid ""
-#~ "You are about to delete nodes outside of the area you have "
-#~ "downloaded.<br>This can cause problems because other objects (that you don't "
-#~ "see) might use them.<br>Do you really want to delete?"
+#~ "You are about to delete nodes outside of the area you have downloaded."
+#~ "<br>This can cause problems because other objects (that you don't see) "
+#~ "might use them.<br>Do you really want to delete?"
 #~ msgstr ""
-#~ "אתה עומד למחוק נקודות מחוץ לשטח שהורדת.<br>זה עלול לגרום לבעיות כיוון שעצמים "
-#~ "אחרים {שאתה לא רואה) עשויים להשתמש בהם.<br>האם אתה באמת רוצה למחוק?"
-
-#, java-format
+#~ "אתה עומד למחוק נקודות מחוץ לשטח שהורדת.<br>זה עלול לגרום לבעיות כיוון "
+#~ "שעצמים אחרים {שאתה לא רואה) עשויים להשתמש בהם.<br>האם אתה באמת רוצה למחוק?"
+
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "פתור {0} התנגשויות ב{1} עצמים"
 
-#, java-format
 #~ msgid "Parsing error in URL: \"{0}\""
 #~ msgstr "שגיאה בניתוח כתובת: \"{0}\""
 
-#, java-format
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "לא יכול לקרוא מכתובת: \"{0}\""
@@ -33221,5 +33501,4 @@
 #~ msgstr "ניתן להשתמש בעכבר או ב- Ctrl+מקשי חיצים/./ למיקוד והזזה."
 
-#, java-format
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr "מדלג על דרך כי היא מכילה נקודה שאינה קיימת: {0}\n"
@@ -33231,5 +33510,4 @@
 #~ msgstr "מזג בכל זאת"
 
-#, java-format
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
@@ -33246,8 +33524,9 @@
 #~ msgstr "נסיוני. שמור את עבודתך וודא לפני העלאה."
 
-#, java-format
-#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
+#~ msgid ""
+#~ "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them all?"
+#~ "The selection contains {0} ways. Are you sure you want to simplify them "
+#~ "all?"
 #~ msgstr[0] "הבחירה מכילה דרך {0}. האם אתה בטוח שאתה רוצה לפשט אותה?"
 #~ msgstr[1] "הבחירה מכילה {0} דרכים. האם אתה בטוח שאתה רוצה לפשט את כולן?"
@@ -33286,5 +33565,4 @@
 #~ msgstr "החלף בחירה עם נתוני משתמש"
 
-#, java-format
 #~ msgid "Checking whether node {0} is gone ..."
 #~ msgstr "בודק האם נקודה {0} נעלמה..."
@@ -33329,5 +33607,4 @@
 #~ msgstr "אף דרך \"from\" לא נמצאה."
 
-#, java-format
 #~ msgid "Inner way ''{0}'' is outside."
 #~ msgstr "דרך פנימית ''{0}'' נמצאת בחוץ."
@@ -33366,5 +33643,4 @@
 #~ msgstr "הורד"
 
-#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "עורך יחסים: {0}"
@@ -33373,9 +33649,7 @@
 #~ msgstr "רמז: כמה מהשינויים נובעים מהעלאת נתונים חדשים לשרת."
 
-#, java-format
 #~ msgid "Parameter ''{0}'' must not be null."
 #~ msgstr "פרמטר ''{0}'' אינו יכול להיות אפס"
 
-#, java-format
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "ערך מוחזר לא צפוי. התקבל {0}"
@@ -33387,13 +33661,10 @@
 #~ msgstr "לא נמצאה גירסה מאוחרת. ההיסטוריה ריקה."
 
-#, java-format
 #~ msgid "Unexpected column index. Got {0}."
 #~ msgstr "אינדקס טור לא צפוי. התקבל {0}"
 
-#, java-format
 #~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
 #~ msgstr "הפרמטר 'col' חייב ליהיות 0 או 1. התקבל {0}"
 
-#, java-format
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "לא ניתן לקרוא את \"{0}\""
Index: /applications/editors/josm/i18n/po/is.po
===================================================================
--- /applications/editors/josm/i18n/po/is.po	(revision 21970)
+++ /applications/editors/josm/i18n/po/is.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-13 13:57+0000\n"
+"POT-Creation-Date: 2010-06-23 22:47+0200\n"
+"PO-Revision-Date: 2010-06-15 18:21+0000\n"
 "Last-Translator: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n"
 "Language-Team: Icelandic <is@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-06-15 16:19+0000\n"
+"X-Launchpad-Export-Date: 2010-06-23 20:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -23,5 +23,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
@@ -93,5 +93,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
@@ -246,5 +246,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
@@ -267,5 +267,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
@@ -273,6 +273,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
@@ -281,4 +283,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 "Upplýsingar"
@@ -649,5 +654,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
@@ -662,5 +667,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 "Fjarlægja"
@@ -909,4 +914,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 ""
@@ -917,4 +923,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 ""
@@ -1464,6 +1471,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
@@ -1490,4 +1497,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
@@ -1496,6 +1505,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 "Villa"
@@ -1599,6 +1608,5 @@
 "Select all undeleted objects in the data layer. This selects incomplete "
 "objects too."
-msgstr ""
-"Velja alla hluti í núverandi lagi. Þetta velur einnig ókláraða hluti."
+msgstr "Velja alla hluti í núverandi lagi. Þetta velur einnig ókláraða hluti."
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
@@ -1608,6 +1616,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 ""
 "Sýna stöðuskýrslu með nytsamlegum upplýsingum sem hægt er að hengja við "
@@ -1645,8 +1652,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 ""
@@ -1655,5 +1664,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 ""
@@ -1661,16 +1671,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 "Veldu í það minnsta einn veg til að einfalda."
@@ -1679,13 +1694,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 "Já"
 
 #: ../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 ""
@@ -1694,8 +1712,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"
@@ -1705,4 +1725,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)"
@@ -1838,6 +1859,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 ""
 
@@ -1903,9 +1923,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)"
@@ -1922,5 +1942,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
@@ -1984,5 +2004,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 "Engar breytingar til að hlaða upp"
@@ -2000,14 +2019,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 ""
@@ -2262,5 +2281,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
@@ -2375,6 +2394,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 ""
 
@@ -2502,5 +2521,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."
@@ -2623,6 +2642,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 ""
 
@@ -2886,10 +2905,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
@@ -3011,5 +3034,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
@@ -3087,11 +3110,11 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231
 msgid ""
-"You are about to delete nodes outside of the area you have "
-"downloaded.<br>This can cause problems because other objects (that you do "
-"not see) might use them.<br>Do you really want to delete?"
-msgstr ""
-"Þú ert að fara eyða hnútum utan þess svæðis sem þú hefur "
-"niðurhalað.<br>Þetta getur valdið vandamálum því aðrir hlutir (sem þú sérð "
-"ekki) gætu verið að nota þá.<br>Ertu viss um að þú viljir eyða þeim?"
+"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 ""
+"Þú ert að fara eyða hnútum utan þess svæðis sem þú hefur niðurhalað."
+"<br>Þetta getur valdið vandamálum því aðrir hlutir (sem þú sérð ekki) gætu "
+"verið að nota þá.<br>Ertu viss um að þú viljir eyða þeim?"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
@@ -3136,11 +3159,11 @@
 msgstr[1] "Færði {0} hnúta"
 
-#: ../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"
@@ -3149,5 +3172,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 #, java-format
 msgid ""
@@ -3156,5 +3179,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}"
@@ -3360,6 +3383,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 ""
 
@@ -3442,5 +3465,5 @@
 #. *
 #. * the decimal format 999.999
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3449,5 +3472,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3456,5 +3479,5 @@
 #. *
 #. * coordinates East/North
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3501,4 +3524,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}"
@@ -3510,29 +3536,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 ""
 
@@ -3611,19 +3631,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 ""
@@ -3632,5 +3652,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 "
@@ -3638,5 +3658,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 ""
@@ -3692,6 +3712,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 ""
 
@@ -3706,5 +3725,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 ""
@@ -3868,6 +3887,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 ""
 
@@ -3938,5 +3956,5 @@
 #. color tiger_data
 #. </rule>
-#. 
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -3946,5 +3964,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -3953,5 +3971,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -3960,5 +3978,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -3967,5 +3985,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -3974,5 +3992,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -3981,9 +3999,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--annotation tags -->
-#. 
+#.
 #. <!--"work in progress" tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="building"/>
@@ -3992,5 +4010,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 "bygging"
@@ -4077,5 +4095,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
@@ -4295,5 +4313,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
@@ -4302,4 +4320,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
@@ -4499,5 +4518,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
@@ -4536,6 +4555,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 ""
 
@@ -4566,5 +4585,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"
@@ -4573,5 +4592,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"
@@ -4580,5 +4599,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"
@@ -4792,6 +4811,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 ""
 
@@ -4871,6 +4889,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 ""
 
@@ -4878,6 +4896,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 ""
 
@@ -4928,6 +4946,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 ""
 
@@ -5144,10 +5162,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"
@@ -5156,10 +5176,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
@@ -5241,4 +5263,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 ""
@@ -5455,7 +5478,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 ""
 
@@ -5480,6 +5503,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 ""
 
@@ -5525,5 +5547,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
@@ -5596,10 +5618,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 ""
 
@@ -5622,5 +5643,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
@@ -5628,5 +5649,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 "Bæta við"
@@ -5675,5 +5696,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 "Breytingaskrá"
@@ -5893,10 +5914,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 ""
@@ -7353,6 +7374,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 ""
 
@@ -7376,8 +7397,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 ""
 
@@ -7497,9 +7518,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 "Bæti vað eigindum"
 
-#: ../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."
@@ -7508,23 +7529,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 "<mismunandi>"
 
-#: ../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 "Breyta eigindum"
 
-#: ../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"
@@ -7533,5 +7554,5 @@
 msgstr[1] "Breyta eigindum allt að {0} hluta"
 
-#: ../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."
@@ -7540,77 +7561,77 @@
 msgstr[1] "Allt að {0} hlutum verður breytt."
 
-#: ../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 "Veldu lykil"
 
-#: ../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 "Veldu gildi"
 
-#: ../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 "Veldu hluti til að breyta eigindum þeirra."
 
-#: ../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 "Eigindi"
 
-#: ../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 "Eigindi valdra hluta."
 
 #. 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 "Stak í"
 
-#: ../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 "{0} eigindi & {1} vensl"
 
-#: ../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 "Eigindi & vensl"
 
-#: ../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 "Breyta venslum"
 
-#: ../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 "Fjarlægja úr venslum"
 
-#: ../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 "Eyða valinu úr venslunum {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 "Eyða völdum lykil í öllum völdum hlutum"
 
-#: ../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 "Eyða eigindum"
 
-#: ../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 "Bæta nýjum eigindum við valda hluti"
 
-#: ../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 "Breyta gildi valins lykils í öllum völdum hlutum"
 
-#: ../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 ""
@@ -7727,6 +7748,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 ""
 
@@ -7744,10 +7765,10 @@
 msgid ""
 "<html>This relation already has one or more members referring to<br>the "
-"primitive ''{0}''<br><br>Do you really want to add another relation "
-"member?</html>"
-msgstr ""
-"<html>Í þessum venslum eru þegar eitt eða fleiri stök sem benda á "
-"hlutinn<br>„{0}“.<br><br>Ertu viss um að þú viljir bæta við öðru staki sem "
-"bendir á þennan hlut?</html>"
+"primitive ''{0}''<br><br>Do you really want to add another relation member?</"
+"html>"
+msgstr ""
+"<html>Í þessum venslum eru þegar eitt eða fleiri stök sem benda á hlutinn<br>"
+"„{0}“.<br><br>Ertu viss um að þú viljir bæta við öðru staki sem bendir á "
+"þennan hlut?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612
@@ -7901,7 +7922,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 ""
 
@@ -8235,7 +8255,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 ""
 
@@ -8376,6 +8395,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 ""
 
@@ -8385,6 +8404,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 ""
 
@@ -8658,9 +8677,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 ""
 
@@ -8675,8 +8693,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 ""
 
@@ -8762,6 +8779,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:90
 msgid "Open a new changeset and use it in the next upload"
-msgstr ""
-"Opna nýtt breytingarsett, gögnum verður bætt í það þegar þú hleður upp"
+msgstr "Opna nýtt breytingarsett, gögnum verður bætt í það þegar þú hleður upp"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:99
@@ -8925,5 +8941,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 ""
@@ -8931,6 +8947,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 ""
 
@@ -9015,6 +9030,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] ""
@@ -9028,6 +9043,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 "
@@ -9253,5 +9268,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9277,6 +9292,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 ""
 
@@ -9331,6 +9345,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 ""
 
@@ -9384,7 +9398,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 ""
 
@@ -9394,5 +9408,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9408,5 +9422,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..."
@@ -9417,6 +9431,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 ""
 
@@ -9426,6 +9439,6 @@
 "be uploaded to the server.</html>"
 msgstr ""
-"<html>Veldu hluti <strong>úr vallistanum</strong> til að hlaða upp á "
-"þjóninn.</html>"
+"<html>Veldu hluti <strong>úr vallistanum</strong> til að hlaða upp á þjóninn."
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:70
@@ -9638,7 +9651,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 ""
 
@@ -9664,7 +9677,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 ""
 
@@ -9728,6 +9741,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 ""
 
@@ -9903,6 +9916,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 ""
 
@@ -9962,7 +9975,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 ""
 
@@ -10533,6 +10546,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 ""
 
@@ -10554,8 +10567,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 ""
 
@@ -10675,6 +10688,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 ""
 
@@ -10784,6 +10797,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 ""
 
@@ -10917,8 +10929,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 ""
 
@@ -11001,8 +11013,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 ""
 
@@ -11029,7 +11041,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 ""
 
@@ -11044,6 +11056,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
 msgid "Setting Preference entries directly. Use with caution!"
-msgstr ""
-"Hér er hægt að breyta öllum JOSM stillingum beint án annara milliliða."
+msgstr "Hér er hægt að breyta öllum JOSM stillingum beint án annara milliliða."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
@@ -11081,5 +11092,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 "Veldu hlut til að eyða fyrst."
@@ -11436,6 +11447,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 ""
 
@@ -11494,6 +11504,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 ""
 
@@ -11565,5 +11574,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 ""
@@ -11583,6 +11592,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>:"
@@ -11707,6 +11715,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 ""
 
@@ -11719,9 +11727,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 ""
 
@@ -12019,6 +12027,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 ""
 
@@ -12029,5 +12037,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 ""
@@ -12037,18 +12045,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 ""
@@ -12057,5 +12065,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 ""
@@ -12064,5 +12072,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 ""
@@ -12071,9 +12079,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 "Forstillingar"
@@ -12182,6 +12190,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 ""
 
@@ -12203,6 +12211,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 ""
 
@@ -12280,6 +12288,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 ""
 
@@ -12295,6 +12302,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 ""
 
@@ -12388,6 +12394,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 ""
 
@@ -12520,4 +12526,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 "Breyta eigindum"
@@ -12683,5 +12690,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
@@ -12701,5 +12708,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}''"
@@ -12862,6 +12869,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 ""
 
@@ -12978,10 +12984,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 ""
@@ -12989,69 +12995,69 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
 msgid "Creating changeset..."
 msgstr "Bý til breytingarsett..."
 
-#: ../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 "Opnaði breytingarsett {0}"
 
-#: ../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 "Uppfæri breytingarsett.."
 
-#: ../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 "Uppfæri breytingarsett {0}..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:388
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389
 msgid "Closing changeset..."
 msgstr "Loka breytingasetti..."
 
-#: ../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}."
@@ -13229,4 +13235,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})"
@@ -13246,6 +13253,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 ""
 
@@ -13273,6 +13280,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 ""
 
@@ -13314,6 +13321,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 ""
 
@@ -13748,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 ""
 
@@ -13755,6 +13761,5 @@
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr ""
-"Gat ekki hlaðið viðbótina „{0}“. Eyða henni úr listanum yfir viðbætur?"
+msgstr "Gat ekki hlaðið viðbótina „{0}“. Eyða henni úr listanum yfir viðbætur?"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:382
@@ -13954,6 +13959,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 +14024,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 +14105,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 +14112,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 +14120,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 +14128,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 +14149,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 +14218,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 +14229,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 +14261,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 ""
 
@@ -14764,6 +14767,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>"
@@ -14790,6 +14793,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"
@@ -14827,6 +14830,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"
@@ -14842,7 +14845,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"
@@ -14893,9 +14896,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 "Byggingar"
+
+#: ../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 "Stillingarritill"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#, fuzzy
+msgid "Building tag:"
+msgstr "Bygging"
+
+#: ../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"
@@ -14904,35 +14926,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 "Opinber bygging"
+
+#: ../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 ""
 
@@ -15107,7 +15138,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--waterway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15117,5 +15148,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15125,5 +15156,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15139,5 +15170,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15147,5 +15178,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15153,8 +15184,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 "vatn"
@@ -15176,5 +15207,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15183,5 +15214,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15190,5 +15221,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15197,5 +15228,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15204,5 +15235,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15211,10 +15242,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 ""
@@ -15243,11 +15274,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 ""
 
@@ -15673,6 +15703,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 "Tómt lag"
@@ -15854,4 +15884,50 @@
 msgid "No GPX data layer found."
 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 "Breyti dýragarð"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#, fuzzy
+msgid "Name:"
+msgstr "Heiti"
+
+#: ../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
+#, fuzzy, java-format
+msgid "Delete tool \"{0}\"?"
+msgstr "Eyða {0} hnút"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:74
+msgid "Are you sure?"
+msgstr ""
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
+msgid "New tool..."
+msgstr ""
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
+#, fuzzy
+msgid "Install"
+msgstr "Iðnaður"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
@@ -16119,5 +16195,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#. 
+#.
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16238,6 +16314,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 ""
 
@@ -16256,7 +16331,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 ""
 
@@ -16563,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 ""
 
@@ -16672,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 ""
 
@@ -16722,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 ""
 
@@ -17085,5 +17156,5 @@
 msgstr "Afturkalla"
 
-#: ../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}"
@@ -17133,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 "Hleð inn viðbótum"
+
+#: ../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
+#, java-format
+msgid "Could not read tagging preset source: ''{0}''"
+msgstr ""
+
+#: ../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 "Val: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:111
+#, java-format
+msgid "Additional sign {0}"
 msgstr ""
 
@@ -17238,4 +17346,14 @@
 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 "Einfalda veg"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
+msgid "Delete unnecessary nodes from an area."
+msgstr ""
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
 msgid "Slippy Map"
@@ -18027,6 +18145,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 ""
 
@@ -18112,8 +18230,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 ""
 
@@ -18167,8 +18285,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 ""
 
@@ -18280,6 +18398,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 ""
 
@@ -18287,6 +18405,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 ""
 
@@ -18933,7 +19051,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 ""
 
@@ -19129,9 +19246,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 ""
@@ -19227,11 +19344,141 @@
 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
+#, fuzzy, java-format
+msgid "{0} {1}% of GPS track"
+msgstr "{0} samanstendur af {1} feril"
+
+#: ../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 "Flytja inn hljóð"
+
+#: ../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 "Fjarlægja"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
+#, fuzzy
+msgid "removes current video from layer"
+msgstr "Fjarlægja myndina úr laginu"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
+msgid "play/pause"
+msgstr ""
+
+#: ../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 "bakgrunnur"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
+msgid "jumps n sec back"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "forward"
+msgstr "Vað"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+msgid "jumps n sec forward"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
+#, fuzzy
+msgid "faster"
+msgstr "Líma"
+
+#: ../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 "Turn"
+
+#: ../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
+msgid "loops n sec around current position"
+msgstr ""
+
+#. 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
+#, fuzzy
+msgid "Loop length"
+msgstr "Lengd"
+
+#: ../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 "lagi"
+
+#: ../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 ""
 
@@ -19444,28 +19691,28 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
 msgid "Automatic downloading"
 msgstr "Sjálfvirkt niðurhal"
 
-#: ../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 ""
@@ -19476,113 +19723,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 "Niðurhala sýnilega reiti"
 
-#: ../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 "Breyta upplausn"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341
 msgid "Reload erroneous tiles"
 msgstr "Hlaða reiti sem innihalda villur"
 
-#: ../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 "Vista WMS lag í skrá"
 
-#: ../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 "Hlaða WMS lag úr skrá"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
 msgid "WMS Plugin Preferences"
 msgstr "Stillingar fyrir WMS viðbótina"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Niðurhalsforrit:"
@@ -19598,4 +19845,8 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
 msgid "% of north:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186
+msgid "Simultaneous connections"
 msgstr ""
 
@@ -19608,7 +19859,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
@@ -19656,8 +19907,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 "skógur (ræktaður)"
@@ -19674,7 +19925,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--boundary tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -19684,5 +19935,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -19725,5 +19976,5 @@
 #. color boundary
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -19733,5 +19984,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -19741,5 +19992,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -19749,15 +20000,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 ""
@@ -19773,5 +20024,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -19780,7 +20031,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--route tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -19790,5 +20041,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -19798,5 +20049,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -19806,5 +20057,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -19814,5 +20065,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -19822,5 +20073,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -19830,5 +20081,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -19838,12 +20089,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 ""
@@ -20120,21 +20371,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 "
@@ -20144,10 +20394,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."
@@ -20155,5 +20405,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 "
@@ -20163,15 +20413,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 "
@@ -20180,5 +20430,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 "
@@ -20188,15 +20438,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"
@@ -20204,5 +20454,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."
@@ -20210,5 +20460,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 "
@@ -20217,5 +20467,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 "
@@ -20224,10 +20474,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."
@@ -20235,15 +20485,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 "
@@ -20252,10 +20503,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 "
@@ -20264,15 +20522,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 "
@@ -20282,10 +20540,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). "
@@ -20294,5 +20552,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) "
@@ -20301,5 +20559,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:89
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20308,10 +20566,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 "
@@ -20320,5 +20578,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 "
@@ -20328,5 +20586,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:97
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20335,15 +20593,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 "
@@ -20352,5 +20610,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:105
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21240,10 +21498,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 "hringtorg"
@@ -21380,8 +21638,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"/>
@@ -21591,5 +21849,5 @@
 #. color motorroad
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21599,5 +21857,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21616,5 +21874,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21624,5 +21882,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21641,5 +21899,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -21649,5 +21907,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -21666,5 +21924,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -21674,5 +21932,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -21687,5 +21945,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -21703,8 +21961,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 "íbúðargata"
@@ -21719,5 +21977,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -21726,5 +21984,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--public_transport tags -->
 #. <rule>
@@ -21734,10 +21992,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 "þjónustuvegur"
@@ -21752,5 +22010,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -21759,5 +22017,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -21767,10 +22025,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 "byggingarsvæði"
@@ -22776,9 +23034,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 ""
@@ -23108,5 +23366,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -23116,5 +23374,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -23124,5 +23382,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -23132,5 +23390,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -23140,5 +23398,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -23148,5 +23406,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -23156,5 +23414,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -23165,5 +23423,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -23171,9 +23429,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 ""
@@ -24583,5 +24841,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24591,5 +24849,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24599,5 +24857,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24607,5 +24865,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -24969,7 +25227,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--sport tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -24979,5 +25237,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -24987,5 +25245,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -24995,5 +25253,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -25003,5 +25261,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -25011,5 +25269,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -25019,5 +25277,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -25027,5 +25285,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -25035,5 +25293,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -25043,5 +25301,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -25051,5 +25309,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -25059,5 +25317,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -25067,5 +25325,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -25075,5 +25333,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -25083,5 +25341,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -25091,5 +25349,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -25099,5 +25357,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -25107,5 +25365,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -25115,5 +25373,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -25123,5 +25381,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -25131,5 +25389,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -25139,5 +25397,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -25147,5 +25405,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -25155,5 +25413,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -25163,5 +25421,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -25171,5 +25429,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -25179,5 +25437,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -25187,5 +25445,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -25195,5 +25453,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -25203,5 +25461,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -25211,5 +25469,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -25219,5 +25477,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -25227,5 +25485,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -25235,5 +25493,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -25243,5 +25501,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -25251,5 +25509,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -25259,5 +25517,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -25267,5 +25525,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -25275,5 +25533,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -25283,5 +25541,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -25291,5 +25549,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -25299,5 +25557,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -25307,5 +25565,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -25315,5 +25573,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -25323,5 +25581,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -25331,5 +25589,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -25339,33 +25597,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 "íþrótt"
@@ -27043,7 +27301,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--landuse tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -27053,5 +27311,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -27061,5 +27319,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -27069,5 +27327,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -27077,5 +27335,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -27085,5 +27343,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -27093,5 +27351,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -27101,5 +27359,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -27109,12 +27367,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 ""
@@ -28530,5 +28788,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -28544,5 +28802,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28552,18 +28810,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 -->
@@ -28572,7 +28847,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- cycleway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28582,5 +28857,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28590,5 +28865,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28598,5 +28873,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28606,12 +28881,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 "hjól"
@@ -28638,5 +28914,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -28652,5 +28928,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -28660,5 +28936,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28667,13 +28943,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"/>
@@ -28684,11 +28968,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 "fótgangandi"
@@ -28707,8 +28992,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 ""
@@ -28820,9 +29105,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
@@ -28830,5 +29115,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,
@@ -28838,8 +29123,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
@@ -28853,5 +29138,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#. 
+#.
 #: build/trans_style.java:72
 msgid "standard"
@@ -28859,5 +29144,5 @@
 
 #. mappaint style named "standard"
-#. 
+#.
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -28906,6 +29191,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>
@@ -28985,5 +29270,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -28993,16 +29278,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 ""
@@ -29013,5 +29298,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -29020,5 +29305,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -29027,5 +29312,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -29041,5 +29326,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -29053,5 +29338,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -29060,5 +29345,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -29067,5 +29352,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -29074,5 +29359,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -29081,5 +29366,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -29088,5 +29373,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -29095,5 +29380,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxweight"/>
@@ -29102,5 +29387,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxheight"/>
@@ -29109,5 +29394,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -29116,5 +29401,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxlength"/>
@@ -29123,5 +29408,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -29130,5 +29415,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="minspeed"/>
@@ -29137,5 +29422,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxstay"/>
@@ -29144,5 +29429,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="toll"/>
@@ -29151,5 +29436,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="barrier"/>
@@ -29326,7 +29611,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- highway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -29340,5 +29625,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -29348,7 +29633,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- tracktype tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -29358,5 +29643,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -29366,5 +29651,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -29374,5 +29659,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -29382,10 +29667,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 ""
@@ -29396,5 +29681,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -29403,5 +29688,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -29411,5 +29696,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -29418,5 +29703,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -29425,5 +29710,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -29432,5 +29717,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -29439,5 +29724,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -29446,5 +29731,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -29453,5 +29738,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -29460,5 +29745,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -29467,5 +29752,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -29474,8 +29759,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 "vegþjónustur"
@@ -29486,8 +29771,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 ""
@@ -29498,5 +29783,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -29505,8 +29790,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 "beygjuhringur"
@@ -29517,9 +29802,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 ""
@@ -29530,9 +29815,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 "árbakki"
@@ -29543,8 +29828,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 "lækur"
@@ -29555,8 +29840,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 ""
@@ -29567,5 +29852,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29574,5 +29859,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29581,5 +29866,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29589,5 +29874,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29596,5 +29881,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29603,5 +29888,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29610,5 +29895,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29618,5 +29903,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29627,5 +29912,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -29635,7 +29920,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--man_made tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -29645,5 +29930,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -29653,5 +29938,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -29661,5 +29946,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -29670,5 +29955,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -29677,5 +29962,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -29685,5 +29970,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -29693,5 +29978,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -29701,5 +29986,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -29709,5 +29994,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -29717,5 +30002,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -29725,5 +30010,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -29733,5 +30018,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -29741,5 +30026,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -29749,18 +30034,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 ""
@@ -29770,9 +30055,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 ""
@@ -29783,7 +30068,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- railway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -29793,5 +30078,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -29800,5 +30085,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -29808,5 +30093,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -29815,5 +30100,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -29823,5 +30108,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -29831,10 +30116,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 ""
@@ -29845,5 +30130,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -29854,13 +30139,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 ""
@@ -29871,5 +30156,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -29879,5 +30164,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29890,5 +30175,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29896,7 +30181,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 ""
@@ -29907,5 +30192,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -29914,5 +30199,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -29921,5 +30206,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -29928,7 +30213,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aeroway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -29939,9 +30224,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 ""
@@ -29952,8 +30237,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 ""
@@ -29964,5 +30249,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -29972,8 +30257,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 ""
@@ -29984,8 +30269,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 ""
@@ -29996,5 +30281,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -30003,5 +30288,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -30010,7 +30295,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aerialway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -30020,5 +30305,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -30028,5 +30313,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -30036,5 +30321,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -30044,5 +30329,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -30052,10 +30337,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 "skíðalyfta"
@@ -30066,11 +30351,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 ""
@@ -30081,9 +30366,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 ""
@@ -30094,9 +30379,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 ""
@@ -30107,9 +30392,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 ""
@@ -30120,9 +30405,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 ""
@@ -30133,9 +30418,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 ""
@@ -30146,7 +30431,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--power tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -30156,5 +30441,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -30163,5 +30448,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -30171,5 +30456,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -30179,5 +30464,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -30187,5 +30472,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -30195,5 +30480,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -30203,5 +30488,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -30211,5 +30496,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -30219,5 +30504,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -30227,5 +30512,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -30235,5 +30520,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -30243,5 +30528,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -30251,15 +30536,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 ""
@@ -30269,9 +30554,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 "bryggja"
@@ -30282,8 +30567,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 "leiðsla"
@@ -30293,7 +30578,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--leisure tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -30303,5 +30588,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -30311,5 +30596,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -30319,5 +30604,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -30327,5 +30612,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -30335,5 +30620,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -30343,5 +30628,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -30351,5 +30636,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -30359,5 +30644,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -30367,5 +30652,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -30375,5 +30660,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -30383,5 +30668,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -30391,5 +30676,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -30399,5 +30684,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -30407,5 +30692,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -30415,5 +30700,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -30423,17 +30708,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 "frístundir"
@@ -30443,9 +30728,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 "smábátahöfn"
@@ -30455,7 +30740,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--amenity tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -30465,5 +30750,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -30473,5 +30758,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -30481,5 +30766,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -30489,5 +30774,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -30497,5 +30782,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -30505,5 +30790,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -30513,5 +30798,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -30521,5 +30806,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -30529,5 +30814,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -30537,14 +30822,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 ""
@@ -30554,5 +30839,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30562,5 +30847,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30570,5 +30855,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30578,5 +30863,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30586,5 +30871,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30594,5 +30879,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30602,5 +30887,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30610,5 +30895,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30618,5 +30903,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30626,5 +30911,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -30634,5 +30919,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -30642,14 +30927,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 ""
@@ -30659,5 +30944,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -30666,5 +30951,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -30674,5 +30959,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -30681,5 +30966,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -30689,5 +30974,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -30697,5 +30982,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -30705,5 +30990,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -30712,5 +30997,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -30720,5 +31005,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -30728,5 +31013,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -30736,5 +31021,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -30744,5 +31029,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -30751,5 +31036,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -30758,5 +31043,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -30765,5 +31050,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -30772,5 +31057,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -30779,5 +31064,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -30786,5 +31071,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -30793,5 +31078,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -30800,5 +31085,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -30807,5 +31092,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -30814,5 +31099,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -30821,5 +31106,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -30828,5 +31113,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -30835,5 +31120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -30843,5 +31128,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -30851,5 +31136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -30859,5 +31144,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -30867,5 +31152,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -30875,5 +31160,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -30883,5 +31168,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -30891,5 +31176,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -30899,5 +31184,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -30907,5 +31192,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -30916,5 +31201,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -30924,5 +31209,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -30932,5 +31217,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -30940,5 +31225,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -30948,5 +31233,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -30956,5 +31241,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -30964,5 +31249,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -30972,5 +31257,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -30980,5 +31265,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -30988,5 +31273,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -30996,5 +31281,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -31004,5 +31289,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -31012,5 +31297,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -31020,5 +31305,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -31028,5 +31313,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -31036,5 +31321,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"/>
@@ -31044,5 +31337,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -31052,5 +31345,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -31060,5 +31353,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -31068,5 +31361,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -31075,27 +31368,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 ""
@@ -31105,5 +31399,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -31113,5 +31407,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -31121,12 +31415,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 ""
@@ -31136,5 +31430,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -31144,5 +31438,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -31152,5 +31446,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -31160,5 +31454,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -31168,5 +31462,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -31176,5 +31470,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -31184,11 +31478,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 ""
@@ -31198,7 +31492,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--shop tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -31208,5 +31502,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -31216,5 +31510,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -31224,5 +31518,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -31232,5 +31526,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -31240,5 +31534,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -31248,5 +31542,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -31256,5 +31550,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -31264,5 +31558,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -31272,5 +31566,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -31280,5 +31574,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -31288,5 +31582,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -31296,5 +31590,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -31304,5 +31598,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -31312,5 +31606,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -31320,5 +31614,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -31328,5 +31622,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -31336,5 +31630,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -31344,5 +31638,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -31352,5 +31646,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -31360,5 +31654,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -31368,5 +31662,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -31376,5 +31670,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -31384,5 +31678,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -31392,5 +31686,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -31400,5 +31694,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -31408,5 +31702,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -31416,5 +31710,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -31424,5 +31718,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -31432,5 +31726,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -31440,5 +31734,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -31448,5 +31742,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -31456,5 +31750,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -31464,5 +31758,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -31472,5 +31766,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -31480,5 +31774,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -31488,5 +31782,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -31496,5 +31790,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -31504,5 +31798,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -31512,5 +31806,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -31520,5 +31814,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -31528,5 +31822,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -31536,31 +31830,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 ""
@@ -31570,7 +31864,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--tourism tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31580,5 +31874,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31588,5 +31882,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31596,5 +31890,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31604,5 +31898,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31612,5 +31906,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31620,5 +31914,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31628,12 +31922,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 "hótel"
@@ -31643,5 +31937,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -31651,5 +31945,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -31659,5 +31953,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -31667,5 +31961,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -31675,5 +31969,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -31683,5 +31977,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -31692,5 +31986,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -31700,5 +31994,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- information tags -->
 #. <rule>
@@ -31708,5 +32002,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -31716,5 +32010,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -31723,5 +32017,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -31730,13 +32024,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 "ferðamennska"
@@ -31746,7 +32040,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--historic tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -31756,5 +32050,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -31764,5 +32058,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -31772,5 +32066,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -31780,5 +32074,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -31788,5 +32082,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -31796,5 +32090,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -31804,5 +32098,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -31812,5 +32106,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -31820,13 +32114,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 ""
@@ -31836,8 +32130,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 ""
@@ -31848,8 +32142,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 ""
@@ -31860,5 +32154,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -31868,8 +32162,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 ""
@@ -31880,8 +32174,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 ""
@@ -31892,6 +32186,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
-#. 
+#.
+#.
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -31901,8 +32195,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 "smásala"
@@ -31913,8 +32207,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 "iðnaður"
@@ -31925,8 +32219,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 ""
@@ -31937,8 +32231,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 ""
@@ -31949,8 +32243,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 ""
@@ -31961,5 +32255,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -31969,7 +32263,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--military tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -31979,5 +32273,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -31987,5 +32281,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -31995,5 +32289,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -32003,11 +32297,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 ""
@@ -32018,8 +32312,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 ""
@@ -32029,8 +32323,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 "tindur"
@@ -32041,9 +32335,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 "jökul"
@@ -32053,9 +32347,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 "eldfjall"
@@ -32065,5 +32359,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -32074,5 +32368,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -32082,5 +32376,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -32090,5 +32384,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -32098,5 +32392,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -32106,12 +32400,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 ""
@@ -32121,9 +32415,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 ""
@@ -32133,9 +32427,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 ""
@@ -32145,9 +32439,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 ""
@@ -32157,9 +32451,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 "leðja"
@@ -32169,9 +32463,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 "strönd"
@@ -32182,5 +32476,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?
@@ -32206,5 +32500,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -32215,11 +32509,11 @@
 #. </rule>
 #. -->
-#. 
+#.
 #. <!--name tags -->
-#. 
+#.
 #. <!--preferences tags -->
-#. 
+#.
 #. <!--place tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -32229,5 +32523,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -32237,5 +32531,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -32245,5 +32539,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -32253,5 +32547,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -32261,5 +32555,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -32269,5 +32563,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -32277,5 +32571,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -32285,5 +32579,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -32293,5 +32587,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -32301,5 +32595,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -32309,5 +32603,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -32317,15 +32611,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 ""
@@ -32335,9 +32629,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 ""
@@ -32428,5 +32722,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#. 
+#.
 #. Data type can be:
 #. node        - a node point
@@ -32434,28 +32728,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
@@ -32570,5 +32864,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#. 
+#.
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32581,5 +32875,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>
@@ -32604,6 +32898,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#. 
-#. 
+#.
+#.
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32612,6 +32906,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#. 
-#. 
+#.
+#.
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32626,6 +32920,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
@@ -32639,6 +32933,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
@@ -32658,6 +32952,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#. 
-#. 
+#.
+#.
 #. only for Japan
 #: build/trans_wms.java:39
@@ -32681,6 +32975,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
@@ -32699,5 +32993,4 @@
 #~ msgstr "Sláðu inn lykilorð"
 
-#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Viðbótin „{0}“ fannst ekki."
@@ -32706,5 +32999,4 @@
 #~ msgstr "Óvistaðar breytingar"
 
-#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "Uppfæra þarf JOSM til að viðbótin „{0}“ geti verið notuð."
@@ -32737,5 +33029,4 @@
 #~ msgstr "Lykilorð á milliþjóni"
 
-#, java-format
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
 #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
@@ -32755,5 +33046,4 @@
 #~ msgstr "Óþekkt skráarending"
 
-#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -32765,5 +33055,4 @@
 #~ "{0}"
 
-#, java-format
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Gat ekki halað niður viðbótinni {0} frá {1}"
@@ -32785,9 +33074,7 @@
 #~ msgstr "nafn"
 
-#, java-format
 #~ msgid "Error: {0}"
 #~ msgstr "Villa: {0}"
 
-#, java-format
 #~ msgid "Warning: {0}"
 #~ msgstr "Viðvörun: {0}"
@@ -32800,5 +33087,6 @@
 
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr "Þú getur notað músina eða Ctrl+örvarlykla/./ til að þysja og hliðra."
+#~ msgstr ""
+#~ "Þú getur notað músina eða Ctrl+örvarlykla/./ til að þysja og hliðra."
 
 #~ msgid "Be sure to include the following information:"
@@ -32820,5 +33108,4 @@
 #~ msgstr "ónefnt"
 
-#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -32826,5 +33113,4 @@
 #~ msgstr[1] "{0} hlutir hafa árekstra:"
 
-#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Skipanasaga: {0}"
@@ -32837,6 +33123,6 @@
 
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want to "
-#~ "combine them?"
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
 #~ msgstr ""
 #~ "Valdir vegir eru stak í mismundandi venslum. Viltu sameina þá þrátt fyrir "
@@ -32846,5 +33132,4 @@
 #~ msgstr "Breyta eigindum"
 
-#, java-format
 #~ msgid "Unknown role ''{0}''."
 #~ msgstr "Óþekkt hlutverk \"{0}\"."
@@ -32853,5 +33138,4 @@
 #~ msgstr "Upphala til OSM..."
 
-#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Vinsamlegast sendu meldinguna á {0}"
@@ -32863,6 +33147,6 @@
 
 #~ 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 ""
 #~ "Reyndu að uppfæra í nýjustu útgáfuna af JOSM og allar viðbætur áður en þú "
@@ -32879,18 +33163,18 @@
 
 #~ msgid ""
-#~ "You are about to delete nodes outside of the area you have "
-#~ "downloaded.<br>This can cause problems because other objects (that you don't "
-#~ "see) might use them.<br>Do you really want to delete?"
+#~ "You are about to delete nodes outside of the area you have downloaded."
+#~ "<br>This can cause problems because other objects (that you don't see) "
+#~ "might use them.<br>Do you really want to delete?"
 #~ msgstr ""
-#~ "Þú ert að fara eyða hnútum utan þess svæðis sem þú hefur "
-#~ "niðurhalað.<br>Þetta getur valdið vandamálum því aðrir hlutir (sem þú sérð "
-#~ "ekki) gætu verið að nota þá.<br>Ertu viss um að þú viljir eyða þeim?"
+#~ "Þú ert að fara eyða hnútum utan þess svæðis sem þú hefur niðurhalað."
+#~ "<br>Þetta getur valdið vandamálum því aðrir hlutir (sem þú sérð ekki) "
+#~ "gætu verið að nota þá.<br>Ertu viss um að þú viljir eyða þeim?"
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still want "
-#~ "to merge them?"
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
 #~ msgstr ""
-#~ "Valdir hnútar eru stök í mismundandi venslum. Viltu sameina þá þrátt fyrir "
-#~ "það?"
+#~ "Valdir hnútar eru stök í mismundandi venslum. Viltu sameina þá þrátt "
+#~ "fyrir það?"
 
 #~ msgid "Sync clock"
@@ -32933,9 +33217,7 @@
 #~ msgstr "Búð"
 
-#, java-format
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "Nota forstillinguna „{0}“ í flokknum „{1}“"
 
-#, java-format
 #~ msgid "Use preset ''{0}''"
 #~ msgstr "Nota forstillinguna „{0}“"
@@ -32988,5 +33270,6 @@
 #~ "Login password to the OSM account. Leave blank to not store any password."
 #~ msgstr ""
-#~ "Lykilorð á OSM þjóninum. Hafðu þetta óútfyllt til að vista ekki lykilorðið."
+#~ "Lykilorð á OSM þjóninum. Hafðu þetta óútfyllt til að vista ekki "
+#~ "lykilorðið."
 
 #~ msgid "Login name (e-mail) to the OSM account."
@@ -33005,5 +33288,4 @@
 #~ msgstr "Færa niður"
 
-#, java-format
 #~ msgid "Members: {0} (linked: {1})"
 #~ msgstr "Stök: {0} (tengd: {1})"
@@ -33013,9 +33295,9 @@
 
 #~ 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 ""
-#~ "Ekki tókst að virkja nýju viðbæturnar. Tryggðu að JOSM hafi réttndi til að "
-#~ "yfirskrifa núverandi viðbætur."
+#~ "Ekki tókst að virkja nýju viðbæturnar. Tryggðu að JOSM hafi réttndi til "
+#~ "að yfirskrifa núverandi viðbætur."
 
 #~ msgid "Please select the row to copy."
@@ -33023,5 +33305,6 @@
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data layer?"
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
 #~ msgstr "Engin gögn til að uppfæra. Þú þarft að niðurhala gögnum fyrst."
 
@@ -33033,22 +33316,19 @@
 
 #~ msgid ""
-#~ "Enable to upload all changes in one request, disable to use one request per "
-#~ "changed primitive"
+#~ "Enable to upload all changes in one request, disable to use one request "
+#~ "per changed primitive"
 #~ msgstr ""
-#~ "Ef þetta er valið verða allar breytingarnar sendar í einni fyrirspurn. En ef "
-#~ "ekki verður gerð ein fyrirspurn fyrir hvern hlut sem breytt var"
+#~ "Ef þetta er valið verða allar breytingarnar sendar í einni fyrirspurn. En "
+#~ "ef ekki verður gerð ein fyrirspurn fyrir hvern hlut sem breytt var"
 
 #~ msgid "Use a new changeset and close it"
 #~ msgstr "Opna nýtt breytingarsett og loka því strax"
 
-#, java-format
 #~ msgid "Use the existing changeset {0} and close it after upload"
 #~ msgstr "Nota opið breytingarsett #{0} og loka því"
 
-#, java-format
 #~ msgid "Use the existing changeset {0} and leave it open"
 #~ msgstr "Nota opið breytingarsett #{0} og skilja það eftir opið"
 
-#, java-format
 #~ msgid ""
 #~ "Select to upload to the existing changeset {0} and to close the changeset "
@@ -33058,5 +33338,4 @@
 #~ "breytingunni hefur verið upphlaðið"
 
-#, java-format
 #~ msgid ""
 #~ "Select to upload to the existing changeset {0} and to leave the changeset "
@@ -33069,8 +33348,9 @@
 #~ msgstr "Endurhlaða vallistann"
 
-#, java-format
-#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
+#~ msgid ""
+#~ "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them all?"
+#~ "The selection contains {0} ways. Are you sure you want to simplify them "
+#~ "all?"
 #~ msgstr[0] ""
 #~ "Þú ert með {0} veg valinn. Ertu viss um að þú viljir einfalda hann?"
@@ -33078,5 +33358,4 @@
 #~ "Þú ert með {0} vegi valda. Ertu viss um að þú viljir einfalda þá alla?"
 
-#, java-format
 #~ msgid ""
 #~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
@@ -33085,11 +33364,10 @@
 #~ "<html>Valið „{0}“ er notað af venslunum „{1}“<br>Eyða úr venslunum?</html>"
 
-#, java-format
 #~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-#~ "from relation?</html>"
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
 #~ msgstr ""
-#~ "<html>Valið „{0}“ er notað af venslunum „{1}“ með hlutverkið „{2}“.<br>Eyða "
-#~ "úr venslunum?</html>"
+#~ "<html>Valið „{0}“ er notað af venslunum „{1}“ með hlutverkið „{2}“."
+#~ "<br>Eyða úr venslunum?</html>"
 
 #~ msgid "Display the history of the selected primitive."
Index: /applications/editors/josm/i18n/po/it.po
===================================================================
--- /applications/editors/josm/i18n/po/it.po	(revision 21970)
+++ /applications/editors/josm/i18n/po/it.po	(revision 21971)
@@ -5,7 +5,7 @@
 "Project-Id-Version: josm 20081003\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-15 17:35+0200\n"
-"PO-Revision-Date: 2010-06-14 12:56+0000\n"
-"Last-Translator: Davide Prade <davalv@alice.it>\n"
+"POT-Creation-Date: 2010-06-23 22:47+0200\n"
+"PO-Revision-Date: 2010-06-21 10:21+0000\n"
+"Last-Translator: Matteo Fumi <fumi.matteo@gmail.com>\n"
 "Language-Team: Italian <talk-it@lists.openstreetmap.org>\n"
 "MIME-Version: 1.0\n"
@@ -13,5 +13,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-06-15 16:19+0000\n"
+"X-Launchpad-Export-Date: 2010-06-23 20:23+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -20,5 +20,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
@@ -90,5 +90,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
@@ -252,5 +252,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
@@ -273,5 +273,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
@@ -279,6 +279,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
@@ -287,4 +289,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
@@ -322,6 +326,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 ""
 "<html>Non ci sono livelli al quale unire il livello sorgente ''{0}''.</html>"
@@ -346,9 +350,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
@@ -408,4 +412,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
@@ -445,5 +450,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 "Informazioni"
@@ -658,5 +663,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
@@ -671,5 +676,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 "Cancella"
@@ -925,4 +930,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 ""
@@ -935,4 +941,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 "Ciò potrebbe portare alla cancellazione accidentale di nodi"
@@ -1313,6 +1320,6 @@
 "due nodi alla selezione. Quindi la direzione è regolata mediante questi due "
 "nodi di riferimento. (In seguito si potrà annullare lo spostamento per "
-"determinati nodi:<br>selezionarli e premere la scorciatoia per Ortogonalizza "
-"/ Annulla. La scorciatoia predefinita è Shift-Q.)"
+"determinati nodi:<br>selezionarli e premere la scorciatoia per "
+"Ortogonalizza / Annulla. La scorciatoia predefinita è Shift-Q.)"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45
@@ -1515,6 +1522,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
@@ -1541,4 +1548,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
@@ -1547,6 +1556,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 "Errore"
@@ -1662,6 +1671,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 ""
 "Visualizza il rapporto dello stato contenente informazioni utili che possono "
@@ -1699,8 +1707,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 "Si, elimina i nodi"
 
 #: ../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 "Elimina i nodi esterni all'area scaricata"
@@ -1709,5 +1719,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 "No, annulla"
@@ -1715,16 +1726,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 "Annulla l'operazione"
 
 #: ../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 "Eliminarli comunque?"
 
 #: ../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 "Eliminare i nodi esterni all'area?"
 
 #: ../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 "Selezionare almeno un percorso da semplificare."
@@ -1733,13 +1749,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 "Si"
 
 #: ../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 "Semplifica tutti i percorsi selezionati"
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:126
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:89
 #, java-format
 msgid ""
@@ -1748,8 +1767,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 "Semplificare i percorsi?"
 
 #: ../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"
@@ -1759,4 +1780,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)"
@@ -1895,6 +1917,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 ""
 "* Un nodo che è in uso da più di un percorso e uno di questi percorsi, oppure"
@@ -1970,9 +1991,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)"
@@ -1989,5 +2010,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
@@ -2059,5 +2080,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 "Nessun cambiamento da caricare."
@@ -2075,14 +2095,14 @@
 msgstr "Carica sul server OSM tutte le modifiche nella selezione corrente"
 
-#: ../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 "Verifica degli elementi da cui dipendevano gli oggetti eliminati"
 
-#: ../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 "Lettura degli elementi da cui dipende ''{0}''"
 
-#: ../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 ""
@@ -2354,5 +2374,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
@@ -2476,6 +2496,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 ""
 "Trascinare la testina e rilasciarla in prossimità di una traccia per "
@@ -2570,7 +2590,7 @@
 "move zoom with right button"
 msgstr ""
-"Cambiare il livello di ingrandimento mediante trascinamento o premendo "
-"Ctrl+. or Ctrl+,; muoversi con Ctrl+su,sinistra,giù,destra; muovere il "
-"livello di ingrandimento con il tasto destro"
+"Cambiare il livello di ingrandimento mediante trascinamento o premendo Ctrl"
+"+. or Ctrl+,; muoversi con Ctrl+su,sinistra,giù,destra; muovere il livello "
+"di ingrandimento con il tasto destro"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48
@@ -2620,5 +2640,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."
@@ -2721,6 +2741,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
-msgstr ""
-"<b>user:anonymous</b> - tutti gli oggetti modificati da utenti anonimi"
+msgstr "<b>user:anonymous</b> - tutti gli oggetti modificati da utenti anonimi"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
@@ -2746,6 +2765,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 ""
 "<b>nodes:</b>... - oggetto con un determinato numero di nodi (nodes:numero "
@@ -2820,6 +2839,6 @@
 msgstr ""
 "All'interno delle stringhe delimitate da virgolette i caratteri <b>\"</b> e "
-"<b>\\</b> devono essere preceduti  da <b>\\</b> (es. <b>\\\"</b> e <b>\\\\"
-"</b>)."
+"<b>\\</b> devono essere preceduti  da <b>\\</b> (es. <b>\\\"</b> e <b>\\\\</"
+"b>)."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
@@ -2898,5 +2917,5 @@
 msgctxt "search"
 msgid "A"
-msgstr ""
+msgstr "A"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
@@ -3046,10 +3065,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
@@ -3175,5 +3198,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
@@ -3255,7 +3278,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 ""
 "Stai per cancellare dei nodi fuori dall''area scaricata.<br>Questo potrebbe "
@@ -3307,11 +3330,11 @@
 msgstr[1] "Sposta {0} nodi"
 
-#: ../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 "Epurato oggetto ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111
 #, java-format
 msgid "Purged {0} object"
@@ -3320,5 +3343,5 @@
 msgstr[1] "Epurati {0} oggetti"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 #, java-format
 msgid ""
@@ -3329,5 +3352,5 @@
 "inferiore a 2. Al momento è {1}"
 
-#: ../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}"
@@ -3550,6 +3573,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 ""
 "<html>Il file delle preferenze contiene degli errori.<br> Salvataggio del "
@@ -3648,5 +3671,5 @@
 #. *
 #. * the decimal format 999.999
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3655,5 +3678,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3662,5 +3685,5 @@
 #. *
 #. * coordinates East/North
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3707,10 +3730,13 @@
 msgstr ""
 "JOSM si aspettava di trovare la primitiva [{0} {1}] nell''insieme di dati, "
-"ma non c''è. Si prega di riportare questo errore al sito "
-"http://josm.openstreetmap.de . Questo non è un errore critico, si può "
-"probabilmente continuare a lavorare senza problemi."
+"ma non c''è. Si prega di riportare questo errore al sito http://josm."
+"openstreetmap.de . Questo non è un errore critico, si può probabilmente "
+"continuare a lavorare senza problemi."
 
 #: ../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}"
@@ -3722,34 +3748,24 @@
 msgstr "Manca la destinazione dell''unione per l''oggetto con id {0}"
 
-#: ../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 "Manca la destinazione dell''unione per il nodo con id {0}"
 
-#: ../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 "Manca la destinazione dell''unione per la relazione con id {0}"
 
-#: ../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 "Manca la destinazione dell''unione di tipo {0} con id {1}"
-
-#. 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 ""
-"L''oggetto di destinazione con identificativo {0} e versione {1} è visibile, "
-"mentre l''oggetto sorgente con versione precedente {2} non è visibile. Non è "
-"possibile gestire questa inconsistenza. Verrà mantenuto l''oggetto di "
-"destinazione. "
 
 #. translators notes must be in front
@@ -3828,19 +3844,19 @@
 "</p><p>Chiudi la finestra di filtro per vedere tutti gli oggetti.<p></html>"
 
-#: ../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 "Una primitiva con ID = 0 non può essere invisibile."
 
-#: ../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 "Era atteso un ID > 0 . Ottenuto {0}."
 
-#: ../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 "attesa versione > 0 . Ottenuto {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:795
 #, java-format
 msgid ""
@@ -3851,5 +3867,5 @@
 "nuova primitiva. Il valore dell''identificativo del gruppo di modifiche è {0}"
 
-#: ../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 "
@@ -3858,5 +3874,5 @@
 "Impossibile unire perché una delle primitive coinvolte è nuova e l''altra no"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1169
 #, java-format
 msgid ""
@@ -3916,6 +3932,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 ""
 "Impossibile confrontare la primitiva con ID ''{0}'' alla primitiva con ID "
@@ -3932,5 +3947,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 "selezionato"
@@ -3996,6 +4011,6 @@
 "NTF<->RGF93 grid"
 msgstr ""
-"Attenzione: è fallita l''apertura del flusso di entrata per la risorsa "
-"''''/data/{0}''''. Impossibile caricare la griglia NTF<->RGF93"
+"Attenzione: è fallita l''apertura del flusso di entrata per la risorsa ''''/"
+"data/{0}''''. Impossibile caricare la griglia NTF<->RGF93"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:137
@@ -4096,9 +4111,8 @@
 #: ../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>"
-msgstr ""
-"<html>Impossibile leggere i segnalibri da<br>''{0}''<br>Errore generato: "
-"{1}</html>"
+msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+"<html>Impossibile leggere i segnalibri da<br>''{0}''<br>Errore generato: {1}"
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
@@ -4168,5 +4182,5 @@
 #. color tiger_data
 #. </rule>
-#. 
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4176,5 +4190,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4183,5 +4197,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4190,5 +4204,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4197,5 +4211,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4204,5 +4218,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4211,9 +4225,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--annotation tags -->
-#. 
+#.
 #. <!--"work in progress" tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="building"/>
@@ -4222,5 +4236,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 "building"
@@ -4307,5 +4321,5 @@
 msgstr "Oggetto eliminato"
 
-#: ../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
@@ -4431,6 +4445,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
-msgstr ""
-"Scarica la zona indicata dall''URL (interpretando lat=x&lon=y&zoom=z)"
+msgstr "Scarica la zona indicata dall''URL (interpretando lat=x&lon=y&zoom=z)"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
@@ -4548,5 +4561,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
@@ -4555,4 +4568,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
@@ -4662,7 +4676,7 @@
 "this list with the mouse.<hr>"
 msgstr ""
-"Cliccare con il tasto centrale nuovamente per proseguire nel "
-"ciclo.<br>Tenere premuto CTRL per selezionare direttamente da questa lista "
-"con il mouse.<hr>"
+"Cliccare con il tasto centrale nuovamente per proseguire nel ciclo."
+"<br>Tenere premuto CTRL per selezionare direttamente da questa lista con il "
+"mouse.<hr>"
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
@@ -4762,5 +4776,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
@@ -4803,11 +4817,11 @@
 "<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 ""
 "<html>In alternativa si può inserire un <strong>indirizzo</strong> per un "
 "singolo tassello nel formato <i>zoomlevel/x/y</i>, es. <i>15/256/223</i>. "
-"Sono anche validi gli indirizzi nel formato <i>zoom,x,y</i> oppure "
-"<i>zoom;x;y</i>.</html>"
+"Sono anche validi gli indirizzi nel formato <i>zoom,x,y</i> oppure <i>zoom;x;"
+"y</i>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
@@ -4839,5 +4853,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"
@@ -4846,5 +4860,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"
@@ -4853,5 +4867,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"
@@ -5087,6 +5101,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 ""
 "Copia i loro elementi selezionati alla fine della lista degli elementi uniti"
@@ -5171,6 +5184,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their "
-"entries.</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 "<html>Clicca <strong>{0}</strong> per iniziare l''unione tra le voci "
@@ -5180,6 +5193,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their "
-"entries.</html>"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
+"html>"
 msgstr ""
 "<html>Clicca <strong>{0}</strong> per terminare l''unione tra le voci "
@@ -5236,6 +5249,6 @@
 #, java-format
 msgid ""
-"<html>An error occurred while communicating with the server<br>Details: "
-"{0}</html>"
+"<html>An error occurred while communicating with the server<br>Details: {0}</"
+"html>"
 msgstr ""
 "<html>E'' stato generato un errore durante la comunicazione con il "
@@ -5311,6 +5324,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99
 msgid "Properties in their dataset, i.e. the server dataset"
-msgstr ""
-"Proprietà nel loro insieme di dati, cioè l''insieme di dati del server"
+msgstr "Proprietà nel loro insieme di dati, cioè l''insieme di dati del server"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115
@@ -5425,6 +5437,6 @@
 "dataset.<br>Do you agree?</html>"
 msgstr ""
-"<html>JOSM dovrà eliminare la tua primitiva locale con identificativo "
-"{0}<br>dall''insieme di dati.<br>Si è d''accordo?</html>"
+"<html>JOSM dovrà eliminare la tua primitiva locale con identificativo {0}"
+"<br>dall''insieme di dati.<br>Si è d''accordo?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685
@@ -5478,10 +5490,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"
@@ -5490,10 +5504,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
@@ -5579,4 +5595,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 "nessuno"
@@ -5617,6 +5634,5 @@
 #, java-format
 msgid "Tag collection does not include the selected value ''{0}''."
-msgstr ""
-"La collezione di etichette non include il valore selezionato ''{0}''."
+msgstr "La collezione di etichette non include il valore selezionato ''{0}''."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:135
@@ -5738,6 +5754,6 @@
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
 msgstr ""
-"<html>Inserire una chiave per l''etichetta, es. "
-"<strong><tt>fixme</tt></strong></html>"
+"<html>Inserire una chiave per l''etichetta, es. <strong><tt>fixme</tt></"
+"strong></html>"
 
 #. Strings in GTK ColorChooser
@@ -5766,8 +5782,8 @@
 "<html>Le strade che sono state combinate sono membri di una o più relazioni. "
 "Decidere se si vuole <strong>mantenere</strong> queste appartenenze o se "
-"desidera <strong>rimuoverle</strong>.<br>Il default è di "
-"<strong>mantenere</strong> la prima strada e <strong>rimuovere</strong> le "
-"altre strade che sono membri della stessa relazione: la combinazione delle "
-"strade rimpiazzerà la strada originale nella relazione.</html>"
+"desidera <strong>rimuoverle</strong>.<br>Il default è di <strong>mantenere</"
+"strong> la prima strada e <strong>rimuovere</strong> le altre strade che "
+"sono membri della stessa relazione: la combinazione delle strade rimpiazzerà "
+"la strada originale nella relazione.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
@@ -5782,9 +5798,9 @@
 "<html>I nodi uniti compaiono come membri in una o più relazioni. Si prega di "
 "decidere se si vuole <strong>mantenere</strong> queste appartenenze per il "
-"nodo di destinazione o se invece si desidera "
-"<strong>eliminarle</strong>.<br>Il comportamento predefinito è quello di "
-"<strong>mantenere</strong> il primo nodo ed <strong>eliminare</strong> gli "
-"altri nodi che sono membri della stessa relazione: il nodo di destinazione "
-"prenderà il posto del nodo originale nella relazione.</html>"
+"nodo di destinazione o se invece si desidera <strong>eliminarle</strong>."
+"<br>Il comportamento predefinito è quello di <strong>mantenere</strong> il "
+"primo nodo ed <strong>eliminare</strong> gli altri nodi che sono membri "
+"della stessa relazione: il nodo di destinazione prenderà il posto del nodo "
+"originale nella relazione.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
@@ -5819,7 +5835,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 ""
 "<html>Selezionare per visualizzare i gruppi di modifiche relativi solamente "
@@ -5850,6 +5866,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 ""
 "Scarica dal server OSM le informazioni riguardanti i gruppi di modifiche "
@@ -5900,5 +5915,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
@@ -5950,6 +5965,5 @@
 msgid ""
 "Set the selected elements on the map to the selected items in the list above."
-msgstr ""
-"Seleziona sulla mappa gli elementi selezionati nella lista qui sopra."
+msgstr "Seleziona sulla mappa gli elementi selezionati nella lista qui sopra."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
@@ -5976,10 +5990,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 ""
 "<html> Non è stata completata la fusione delle differenze in questo "
@@ -6008,5 +6021,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
@@ -6014,5 +6027,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 "Aggiungi"
@@ -6061,5 +6074,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 "Cronologia"
@@ -6220,6 +6233,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:433
 msgid "Set the current selection to the list of selected relations"
-msgstr ""
-"Imposta la selezione corrente con la lista delle relazioni selezionate"
+msgstr "Imposta la selezione corrente con la lista delle relazioni selezionate"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
@@ -6286,10 +6298,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 "Seleziona nella lista delle relazioni"
 
 #: ../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 "Selezionare la relazione nella lista delle relazioni"
@@ -7799,9 +7811,9 @@
 #, 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>"
-msgstr ""
-"Immetere una data nel formato usato dal tuo settaggio locale.<br>Esempio: "
-"{0}<br>Esempio: {1}<br>Esempio: {2}<br>Esempio: {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 ""
+"Immetere una data nel formato usato dal tuo settaggio locale.<br>Esempio: {0}"
+"<br>Esempio: {1}<br>Esempio: {2}<br>Esempio: {3}<br>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1127
@@ -7829,8 +7841,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 ""
 "<html>Si prega di selezionare una delle seguenti <strong>interrogazioni "
@@ -7850,6 +7862,6 @@
 msgstr ""
 "<html>Scarica i miei gruppi di modifiche aperti<br><em>Disabilitato. Si "
-"prega prima di inserire il proprio nome utente OSM nelle "
-"preferenze.</em></html>"
+"prega prima di inserire il proprio nome utente OSM nelle preferenze.</em></"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:157
@@ -7862,7 +7874,7 @@
 "currently no map view active.</em></html>"
 msgstr ""
-"<html>Scarica i gruppi di modifiche nella vista corrente della "
-"mappa.<br><em>Disabilitato. Al momento non c''è alcuna vista della mappa "
-"aperta.</em></html>"
+"<html>Scarica i gruppi di modifiche nella vista corrente della mappa."
+"<br><em>Disabilitato. Al momento non c''è alcuna vista della mappa aperta.</"
+"em></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:168
@@ -7925,11 +7937,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:172
 msgid "Illegal changeset query URL"
-msgstr ""
-"Indirizzo URL di una interrogazione sui gruppi di modifiche non valido"
+msgstr "Indirizzo URL di una interrogazione sui gruppi di modifiche non valido"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:209
 msgid "Close the dialog and abort querying of changesets"
-msgstr ""
-"Chiudi la finestra e annulla l''interrogazione sui gruppi di modifiche"
+msgstr "Chiudi la finestra e annulla l''interrogazione sui gruppi di modifiche"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:56
@@ -7974,9 +7984,9 @@
 "L'indirizzo URL per l'interrogazione sui gruppi di modifiche non è valido"
 
-#: ../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 "Aggiungi proprietà"
 
-#: ../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."
@@ -7985,23 +7995,23 @@
 msgstr[1] "Questo modificherà fino a {0} oggetti."
 
-#: ../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 "Un campo vuoto cancellerà il tag"
 
-#: ../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 "<diverso>"
 
-#: ../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 "Cambiare i valori?"
 
-#: ../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"
@@ -8010,5 +8020,5 @@
 msgstr[1] "Cambia le proprietà di al massimo {0} oggetti"
 
-#: ../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."
@@ -8017,77 +8027,77 @@
 msgstr[1] "Questo cambierà {0} oggetti."
 
-#: ../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 "Seleziona una chiave"
 
-#: ../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 "Seleziona un valore"
 
-#: ../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 "Seleziona gli oggetti di cui vuoi cambiare le proprietà."
 
-#: ../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 "Proprietà/Appartenenze"
 
-#: ../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 "Proprietà per gli oggetti selezionati."
 
 #. 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 "Membro di"
 
-#: ../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 "Posizione"
 
-#: ../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 "Proprietà: {0} / Appartenenze: {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 "Proprietà / Appartenenze"
 
-#: ../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 "Cambia relazione"
 
-#: ../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 "Elimina dalla relazione"
 
-#: ../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 "Vuoi veramente cancellare la selezione dalla relazione {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 "Cancella la chiave selezionata in tutti gli oggetti"
 
-#: ../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 "Elimina proprietà"
 
-#: ../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 "Aggiungi una nuova coppia chiave/valore a tutti gli oggetti"
 
-#: ../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 "Modifica il valore della chiave selezionata per tutti gli oggetti"
 
-#: ../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 "Selezionare la relazione"
 
-#: ../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 "Selezionare la relazione nella selezione principale"
@@ -8208,6 +8218,6 @@
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
-"relation itself.<br>This creates circular dependencies and is "
-"discouraged.<br>How do you want to proceed with circular dependencies?</html>"
+"relation itself.<br>This creates circular dependencies and is discouraged."
+"<br>How do you want to proceed with circular dependencies?</html>"
 msgstr ""
 "<html>C''è almeno un membro in questa relazione che si riferisce<br>alla "
@@ -8229,6 +8239,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 ""
 "<html>Questa relazione contiene già uno o più membri che si "
@@ -8409,7 +8419,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 ""
 "<html>Il livello ''''{0}'''' contiene già un conflitto per la "
@@ -8700,6 +8709,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
-msgstr ""
-"Per la longitudine è richiesto un valore nell''intervallo [-180,180]."
+msgstr "Per la longitudine è richiesto un valore nell''intervallo [-180,180]."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
@@ -8742,7 +8750,7 @@
 "into the currently active data layer.</html>"
 msgstr ""
-"<html>Seleziona per scaricare i dati in un nuovo livello dei "
-"dati.<br>Deselezionare per scaricare nel livello dei dati correntemente "
-"attivo.</html>"
+"<html>Seleziona per scaricare i dati in un nuovo livello dei dati."
+"<br>Deselezionare per scaricare nel livello dei dati correntemente attivo.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219
@@ -8775,11 +8783,10 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is "
-"enabled.<br>Please chose to either download OSM data, or GPX data, or "
-"both.</html>"
-msgstr ""
-"<html>Né <strong>{0}</strong> né <strong>{1}</strong> sono "
-"abilitati.<br>Scegliere se scaricare i dati OSM, oppure i dati GPX, oppure "
-"entrambi.</html>"
+"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
+"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
+msgstr ""
+"<html>Né <strong>{0}</strong> né <strong>{1}</strong> sono abilitati."
+"<br>Scegliere se scaricare i dati OSM, oppure i dati GPX, oppure entrambi.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
@@ -8920,6 +8927,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 ""
 "<html><p class=\"warning-header\">Contenuto mancante per l''argomento di "
@@ -8929,6 +8936,6 @@
 "contributo per migliorare il sistema di aiuto JOSM ed inserire le "
 "informazioni mancanti. E'' possibile modificare l''argomento di aiuto <a "
-"href=\"{2}\">nella propria lingua ({1})</a> oppure l''argomento <a "
-"href=\"{3}\">in inglese</a>.</p></html>"
+"href=\"{2}\">nella propria lingua ({1})</a> oppure l''argomento <a href=\"{3}"
+"\">in inglese</a>.</p></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
@@ -8937,6 +8944,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 ""
 "<html><p class=\"error-header\">Errore durante l''ottenimento delle "
@@ -8951,7 +8958,7 @@
 "network problem, please check<br>your internet connection</html>"
 msgstr ""
-"<html>Fallita l''apertura della pagina di aiuto per l''indirizzo url "
-"{0}.<br>Questo probabilmente è dovuto ad un problema di rete. Si prega "
-"pertanto di controllare<br>la propria connessione ad internet</html>"
+"<html>Fallita l''apertura della pagina di aiuto per l''indirizzo url {0}."
+"<br>Questo probabilmente è dovuto ad un problema di rete. Si prega pertanto "
+"di controllare<br>la propria connessione ad internet</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360
@@ -9146,6 +9153,6 @@
 "<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
 msgstr ""
-"<html>Versione <strong>{0}</strong> attualmente editata nel layer "
-"''{1}''</html>"
+"<html>Versione <strong>{0}</strong> attualmente editata nel layer ''{1}''</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:98
@@ -9241,19 +9248,18 @@
 "version of one<br>of your nodes, ways, or relations.<br>The conflict is "
 "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click "
-"<strong>{4}</strong> to synchronize the conflicting primitive only.<br>Click "
-"<strong>{5}</strong> to synchronize the entire local dataset with the "
-"server.<br>Click <strong>{6}</strong> to abort and continue "
-"editing.<br></html>"
+"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
+"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
+"strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{6}</strong> to abort and continue editing.<br></html>"
 msgstr ""
 "<html>Caricamento <strong>fallito</strong> perché il server possiede una "
 "versione più recente di uno<br>dei tuoi nodi, percorsi, o relazioni.<br>Il "
-"conflitto è stato causato da <strong>{0}</strong> con identificativo "
-"<strong>{1}</strong>,<br>il server possiede la versione {2}, la tua versione "
-"è {3}.<br><br>Cliccare <strong>{4}</strong> per sincronizzare solamente la "
+"conflitto è stato causato da <strong>{0}</strong> con identificativo <strong>"
+"{1}</strong>,<br>il server possiede la versione {2}, la tua versione è {3}."
+"<br><br>Cliccare <strong>{4}</strong> per sincronizzare solamente la "
 "primitiva che causa il conflitto.<br>Cliccare <strong>{5}</strong> per "
 "sincronizzare tutto l''insieme di dati locale con il server.<br>Cliccare "
-"<strong>{6}</strong> per annullare e continuare ad apportare delle "
-"modifiche.<br></html>"
+"<strong>{6}</strong> per annullare e continuare ad apportare delle modifiche."
+"<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
@@ -9267,14 +9273,13 @@
 msgid ""
 "<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click "
-"<strong>{0}</strong> to synchronize the entire local dataset with the "
-"server.<br>Click <strong>{1}</strong> to abort and continue "
-"editing.<br></html>"
+"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
+"</strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{1}</strong> to abort and continue editing.<br></html>"
 msgstr ""
 "<html>Caricamento <strong>fallito</strong> perché il server possiede una "
-"versione più recente di uno<br>dei tuoi nodi, percorsi, o "
-"relazioni.<br><br>Cliccare <strong>{0}</strong> per sincronizzare tutto "
-"l''insieme di dati locale con il server.<br>Cliccare <strong>{1}</strong> "
-"per annullare e continuare ad apportare delle modifiche.<br></html>"
+"versione più recente di uno<br>dei tuoi nodi, percorsi, o relazioni."
+"<br><br>Cliccare <strong>{0}</strong> per sincronizzare tutto l''insieme di "
+"dati locale con il server.<br>Cliccare <strong>{1}</strong> per annullare e "
+"continuare ad apportare delle modifiche.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194
@@ -9398,6 +9403,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:309
 msgid "Load the list of your open changesets from the server"
-msgstr ""
-"Carica dal server la lista degli insiemi di modifiche personali aperti"
+msgstr "Carica dal server la lista degli insiemi di modifiche personali aperti"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:327
@@ -9553,5 +9557,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 "No"
@@ -9559,6 +9563,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 ""
 "Il livello ''''{0}'''' contiene delle modifiche che dovrebbero essere "
@@ -9607,6 +9610,5 @@
 #, java-format
 msgid "Select to upload layer ''{0}'' to the server ''{1}''"
-msgstr ""
-"Selezionare per caricare il livello ''''{0}'''' sul server ''''{1}''''"
+msgstr "Selezionare per caricare il livello ''''{0}'''' sul server ''''{1}''''"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:49
@@ -9653,6 +9655,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] ""
 "<html>{0} livello ha la necessità di essere salvato ma non possiede alcun "
@@ -9672,6 +9674,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 "
@@ -9854,6 +9856,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
 msgid "Decide how to upload the data and which changeset to use"
-msgstr ""
-"Decidere come caricare i dati e quale insieme di modifiche utilizzare"
+msgstr "Decidere come caricare i dati e quale insieme di modifiche utilizzare"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
@@ -9917,5 +9918,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9934,6 +9935,6 @@
 msgid "Objects are uploaded to a <strong>new changeset</strong>."
 msgstr ""
-"Gli oggetti saranno caricati su un <strong>nuovo gruppo di "
-"modifiche</strong>."
+"Gli oggetti saranno caricati su un <strong>nuovo gruppo di modifiche</"
+"strong>."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48
@@ -9943,10 +9944,9 @@
 "comment ''{1}''."
 msgstr ""
-"Gli oggetti sono stati caricati sul <strong>gruppo di modifiche "
-"aperto</strong> {0} con il commento ''''{1}''''."
+"Gli oggetti sono stati caricati sul <strong>gruppo di modifiche aperto</"
+"strong> {0} con il commento ''''{1}''''."
 
 #: ../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 ""
 "Il gruppo di modifiche sarà <strong>chiuso</strong> dopo questo caricamento"
@@ -10011,13 +10011,13 @@
 msgstr ""
 "{0} oggetti superano il limite massimo consentito di {1} oggetti in un "
-"gruppo di modifiche sul server ''''{2}''''. Si prega di <a "
-"href=\"urn:advanced-configuration\">scegliere</a> la modalità con "
-"<strong>gruppi di modifiche multipli</strong>"
+"gruppo di modifiche sul server ''''{2}''''. Si prega di <a href=\"urn:"
+"advanced-configuration\">scegliere</a> la modalità con <strong>gruppi di "
+"modifiche multipli</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:101
 #, 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 ""
 "Caricamento di <strong>{0} oggetti</strong> su <strong>più gruppi di "
@@ -10063,7 +10063,7 @@
 "on the server ''{1}''."
 msgstr ""
-"Il server ha riportato che il gruppo di modifiche corrente è stato "
-"chiuso.<br>Questo perché probabilmente la dimensione dei gruppi di modifiche "
-"supera il limite massimo<br>di {0} oggetti sul server ''{1}''."
+"Il server ha riportato che il gruppo di modifiche corrente è stato chiuso."
+"<br>Questo perché probabilmente la dimensione dei gruppi di modifiche supera "
+"il limite massimo<br>di {0} oggetti sul server ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:107
@@ -10078,7 +10078,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 ""
 "Cliccare ''<strong>{0}</strong>'' per continuare il caricamento su nuovi "
@@ -10092,5 +10092,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -10110,5 +10110,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..."
@@ -10119,6 +10119,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 ""
 "L''eccezione che è stata generata verrà ignorata perché il caricamento è "
@@ -10181,6 +10180,6 @@
 msgstr ""
 "<html>Sono necessari <strong>più gruppi di modifiche</strong> per permettere "
-"il caricamento di  {0} oggetti. Quale strategia si desidera "
-"utilizzare?</html>"
+"il caricamento di  {0} oggetti. Quale strategia si desidera utilizzare?</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191
@@ -10360,11 +10359,11 @@
 #, 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>"
-msgstr ""
-"<html>Sono stati scaricati dal server i dati nel livello GPX "
-"''''{0}''''.<br>Siccome i suoi punti non includono una marcatura temporale "
-"non è possibile correlarli con la traccia audio.</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 ""
+"<html>Sono stati scaricati dal server i dati nel livello GPX ''''{0}''''."
+"<br>Siccome i suoi punti non includono una marcatura temporale non è "
+"possibile correlarli con la traccia audio.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
@@ -10389,11 +10388,11 @@
 #, 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>"
-msgstr ""
-"<html>Sono stati scaricati dal server i dati nel livello GPX "
-"''''{0}''''.<br>Siccome i suoi punti non includono una marcatura temporale "
-"non è possibile correlarli con le immagini.</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 ""
+"<html>Sono stati scaricati dal server i dati nel livello GPX ''''{0}''''."
+"<br>Siccome i suoi punti non includono una marcatura temporale non è "
+"possibile correlarli con le immagini.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
@@ -10456,6 +10455,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 ""
 "<html>Il caricamento di dati GPS non elaborati assunti come dati "
@@ -10653,6 +10652,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 ""
 "<html>Il caricamento di dati GPS non elaborati assunti come dati "
@@ -10715,11 +10714,11 @@
 #: ../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 ""
 "<html>Fotografa il tuo ricevitore GPS mentre indica l''ora.<br>Visualizza "
-"qui la foto.<br>Copia l''ora dalla foto e seleziona la fascia "
-"oraria<hr></html>"
+"qui la foto.<br>Copia l''ora dalla foto e seleziona la fascia oraria<hr></"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
@@ -11261,7 +11260,7 @@
 "to use the Access Token in this JOSM session only.</html>"
 msgstr ""
-"<html>Selezionare per salvare il token di accesso nelle preferenze di "
-"JOSM.<br>Deselezionare per utilizzare il token di accesso solamente in "
-"questa sessione di JOSM.</html>"
+"<html>Selezionare per salvare il token di accesso nelle preferenze di JOSM."
+"<br>Deselezionare per utilizzare il token di accesso solamente in questa "
+"sessione di JOSM.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
@@ -11329,6 +11328,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 ""
 "<html>Lanciare una procedeura automatica per ottenere un gettone di accesso "
@@ -11360,8 +11359,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 ""
 "Si prega di inserire il proprio nome utente e password OSM. La password "
@@ -11387,8 +11386,8 @@
 "(HTTPS)."
 msgstr ""
-"<strong>Attenzione:</strong> La password è trasferita <strong>una "
-"volta</strong> in chiaro al sito web di OSM. <strong>Non</strong> utilizzare "
-"una password importante finché il server OSM non provvede all''instaurazione "
-"di un canale di comunicazione cifrato (HTTPS)."
+"<strong>Attenzione:</strong> La password è trasferita <strong>una volta</"
+"strong> in chiaro al sito web di OSM. <strong>Non</strong> utilizzare una "
+"password importante finché il server OSM non provvede all''instaurazione di "
+"un canale di comunicazione cifrato (HTTPS)."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:173
@@ -11508,10 +11507,10 @@
 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 ""
 "<html>E'' fallito il processo automatico per l''ottenimento di un token di "
-"accesso OAuth<br>dal server di OSM. JOSM non è riuscito ad accedere a "
-"{0}<br>con l''utente {1}.<br><br>Si prega di controllare il nome utente e la "
+"accesso OAuth<br>dal server di OSM. JOSM non è riuscito ad accedere a {0}"
+"<br>con l''utente {1}.<br><br>Si prega di controllare il nome utente e la "
 "password e di riprovare.</html>"
 
@@ -11589,6 +11588,6 @@
 msgstr ""
 "Con OAuth si concede a JOSM il diritto di caricare i dati della mappa ed i "
-"tracciati GPS per proprio conto (<a href=\"{0}\">maggiori "
-"informazioni...</a>)."
+"tracciati GPS per proprio conto (<a href=\"{0}\">maggiori informazioni...</"
+"a>)."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:126
@@ -11613,6 +11612,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:107
 msgid "Warning: failed to cancel running OAuth operation"
-msgstr ""
-"Attenzione: fallito l'annullamento dell'operazione OAuth in esecuzione"
+msgstr "Attenzione: fallito l'annullamento dell'operazione OAuth in esecuzione"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:131
@@ -11635,6 +11633,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 ""
 "Fallita l''autenticazione dell''utente ''''{0}'''' con la password "
@@ -11730,6 +11727,6 @@
 msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
 msgstr ""
-"<html>Fallito l''ottenimento di un token di accesso OAuth da "
-"''''{0}''''.</html>"
+"<html>Fallito l''ottenimento di un token di accesso OAuth da ''''{0}''''.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
@@ -11746,6 +11743,6 @@
 msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
 msgstr ""
-"<html>Fallito l''ottenimento di un token di richiesta OAuth da "
-"''''{0}''''.</html>"
+"<html>Fallito l''ottenimento di un token di richiesta OAuth da ''''{0}''''.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:130
@@ -11786,8 +11783,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 ""
 "<html>JOSM ha ottenuto con successo un token di richiesta. JOSM ora aprirà "
@@ -11891,14 +11888,14 @@
 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>"
-msgstr ""
-"<html>Il token di accesso ''{1}'' è conosciuto dal server OSM "
-"''{0}''.<br>Però la verifica di ottenimento dei dettagli utente per questo "
-"token è fallita.<br>A seconda della tipologia di permessi assegnati a questo "
-"token potrebbe non essere possibile<br>caricare dati, caricare tracciati "
-"GPS, e/o accedere ad altre risorse protette.</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 ""
+"<html>Il token di accesso ''{1}'' è conosciuto dal server OSM ''{0}''."
+"<br>Però la verifica di ottenimento dei dettagli utente per questo token è "
+"fallita.<br>A seconda della tipologia di permessi assegnati a questo token "
+"potrebbe non essere possibile<br>caricare dati, caricare tracciati GPS, e/o "
+"accedere ad altre risorse protette.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
@@ -11931,7 +11928,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 ""
 "<html>La verifica è fallita perché il server ha risposto con un errore "
@@ -11987,5 +11984,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 "Scegli la riga da cancellare."
@@ -12370,6 +12367,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 ""
 "Disegna le frecce di direzione usando riferimenti tabellari piuttosto che "
@@ -12439,6 +12435,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 ""
 "Applicando l''antialiasing alla mappa, la visualizzazione risulterà migliore."
@@ -12514,5 +12509,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 "Abilita lo stile predefinito ''incorporato''"
@@ -12532,6 +12527,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>:"
@@ -12539,6 +12533,6 @@
 "La seguente estensione è stata scaricata con <strong>successo</strong>:"
 msgstr[1] ""
-"Le seguenti {0} estensioni sono state scaricate con "
-"<strong>successo</strong>:"
+"Le seguenti {0} estensioni sono state scaricate con <strong>successo</"
+"strong>:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
@@ -12666,6 +12660,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 ""
 "<p>Inoltre, le scorciatoie sono attivate quando le azioni sono assegnate ad "
@@ -12683,9 +12677,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 ""
 "<p>Si dovrebbe sapere che la lista di selezione dei tasti nella pagina "
@@ -13009,6 +13003,6 @@
 #, java-format
 msgid ""
-"<html>Failed to load the list of style sources "
-"from<br>''{0}''.<br><br>Details (untranslated):<br>{1}</html>"
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
 msgstr ""
 "<html>Fallito il caricamento della lista dei sorgenti degli stili "
@@ -13023,5 +13017,5 @@
 "''''{0}''''. Ottenuto ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #, java-format
 msgid ""
@@ -13033,5 +13027,5 @@
 
 #. 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}"
@@ -13039,10 +13033,10 @@
 "Non è stato possibile leggere il sorgente delle etichette preimpostate {0}"
 
-#: ../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>"
+"really want to use it?<br><br><table width=600>Error is: [{1}:{2}] {3}</"
+"table></html>"
 msgstr ""
 "<html>Il sorgente delle etichette preimpostate {0} può essere caricato, ma "
@@ -13050,5 +13044,5 @@
 "width=600>L''errore è: [{1}:{2}] {3}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
 #, java-format
 msgid ""
@@ -13060,5 +13054,5 @@
 "width=400>L''errore è: [{1}:{2}] {3}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
 #, java-format
 msgid ""
@@ -13070,5 +13064,5 @@
 "width=600>L''errore è: {1}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:101
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
 #, java-format
 msgid ""
@@ -13080,9 +13074,9 @@
 "width=600>L''errore è: {1}</table></html>"
 
-#: ../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 "Ordina il menu dei preimpostati"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
 msgid "Tagging Presets"
 msgstr "Etichette preimpostate"
@@ -13200,6 +13194,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 ""
 "<html>Fallita la costruzione dell''indirizzo URL ''''{0}'''' per la "
@@ -13227,6 +13221,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 ""
 "<html>Fallito l''ottenimento di una lista dei gruppi di modifiche dal server "
@@ -13244,6 +13238,6 @@
 "<html>Il server delle API di OSM su ''{0}'' non ha restituito una risposta "
 "valida.<br>E'' come se ''{0}'' non fosse un server delle API di OSM.<br>Si "
-"prega di controllare la digitazione di ''{0}'' e di validare "
-"nuovamente.</html>"
+"prega di controllare la digitazione di ''{0}'' e di validare nuovamente.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
@@ -13302,6 +13296,6 @@
 "password è memorizzata in chiaro nel file delle preferenze di JOSM. Inoltre "
 "è trasferita <strong>non criptata</strong> in ogni richiesta inviata al "
-"server OSM. <strong>Non utilizzare una password "
-"importante.</strong></p></body></html>"
+"server OSM. <strong>Non utilizzare una password importante.</strong></p></"
+"body></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:117
@@ -13326,6 +13320,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 ""
 "Attenzione: Fallito l'ottenimento del token di accesso OAuth dal gestore "
@@ -13347,6 +13340,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 "Si possiede già un token di accesso al server OSM mediante OAuth."
 
@@ -13381,6 +13373,6 @@
 msgid "<html>Use the default OSM server URL (<strong>{0}</strong>)</html>"
 msgstr ""
-"<html>Utilizza l''indirizzo URL predefinito del server OSM "
-"(<strong>{0}</strong>)</html>"
+"<html>Utilizza l''indirizzo URL predefinito del server OSM (<strong>{0}</"
+"strong>)</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:88
@@ -13450,6 +13442,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 ""
 "Utilizza le impostazioni di sistema standard (disabilitato. Per abilitare "
@@ -13589,4 +13581,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 "Modifica Proprietà"
@@ -13741,6 +13734,5 @@
 #, java-format
 msgid "Illegal port number in preference ''{0}''. Got {1}."
-msgstr ""
-"Numero di porta non valido nella preferenza ''''{0}''''. Ottenuto {1}."
+msgstr "Numero di porta non valido nella preferenza ''''{0}''''. Ottenuto {1}."
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
@@ -13778,5 +13770,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
@@ -13801,5 +13793,5 @@
 msgstr "Analisi della risposta proveniente dal server..."
 
-#: ../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}''"
@@ -13959,6 +13951,5 @@
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
-msgstr ""
-"Fallita l''apertura del flusso di ingresso per la risorsa ''''{0}''''"
+msgstr "Fallita l''apertura del flusso di ingresso per la risorsa ''''{0}''''"
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:105
@@ -13973,6 +13964,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 ""
 "Nessuna primitiva con id {0} nell''insieme di dati locale. Impossibile "
@@ -14098,11 +14088,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 ""
-"Formato di ID non atteso restituito dal server. Ottenuto ''''{0}''''."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:278
+msgstr "Formato di ID non atteso restituito dal server. Ottenuto ''''{0}''''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -14112,66 +14101,65 @@
 "''''{0}''''. Ottenuto ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
 msgid "Creating changeset..."
 msgstr "Creazione dell''insieme di modifiche..."
 
-#: ../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 "Insieme di modifiche {0} aperto con successo"
 
-#: ../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 "Era atteso un insieme di modifiche con ID > 0. Ottenuto {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349
 msgid "Updating changeset..."
 msgstr "Aggiornamento dell''insieme di modifiche..."
 
-#: ../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 "Aggiornamento dell''insieme di modifiche {0}..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:388
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389
 msgid "Closing changeset..."
 msgstr "Chiusura del gruppo di modifiche..."
 
-#: ../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 ""
 "Non è presente alcun gruppo di modifiche per il caricamento differenziale"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
 msgid "Preparing upload request..."
 msgstr "Preparazione della richiesta di caricamento..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447
 msgid "Waiting 10 seconds ... "
 msgstr "Attesa di 10 secondi ... "
 
-#: ../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 "Inizio del ripristino {0} di {1} in {2} secondi ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:458
 msgid "OK - trying again."
 msgstr "OK - nuovo tentativo."
 
-#: ../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 "Inizio del ripristino {0} di {1}."
 
-#: ../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 ""
-"Il gruppo di modifiche corrente è nullo. Impossibile caricare i dati."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:636
+msgstr "Il gruppo di modifiche corrente è nullo. Impossibile caricare i dati."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:637
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
@@ -14180,5 +14168,5 @@
 "{0}."
 
-#: ../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}."
@@ -14332,12 +14320,10 @@
 #, java-format
 msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
-msgstr ""
-"Valore non valido per l''attributo ''''{0}''''. Ottenuto ''''{1}''''."
+msgstr "Valore non valido per l''attributo ''''{0}''''. Ottenuto ''''{1}''''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:83
 #, java-format
 msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
-msgstr ""
-"Valore numerico non valido per l''attributo ''{0}''. Ottenuto ''{1}''."
+msgstr "Valore numerico non valido per l''attributo ''{0}''. Ottenuto ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:117
@@ -14388,4 +14374,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})"
@@ -14401,12 +14388,12 @@
 msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
 msgstr ""
-"<html>E'' stato generato un errore durante il salvataggio.<br>L''errore "
-"è:<br>{0}</html>"
+"<html>E'' stato generato un errore durante il salvataggio.<br>L''errore è:"
+"<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
 #, 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 ""
 "<html>E'' stato generato un errore durante il ripristino del file della "
@@ -14416,6 +14403,5 @@
 #, java-format
 msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-"Impossibile fare una copia di sicurezza del file. L''eccezione è: {0}"
+msgstr "Impossibile fare una copia di sicurezza del file. L''eccezione è: {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
@@ -14437,6 +14423,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 ""
 "Attributi obbligatori mancanti sull''elemento ''''bounds''''. Ottenuto "
@@ -14454,6 +14440,5 @@
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
-msgstr ""
-"Attributo obbligatorio ''''{0}'''' mancante su <nd> del percorso {1}."
+msgstr "Attributo obbligatorio ''''{0}'''' mancante su <nd> del percorso {1}."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
@@ -14487,6 +14472,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 ""
 "Valore non valido per l''attributo ''''ref'''' sul membro nella relazione "
@@ -14811,6 +14795,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:218
 msgid "Unexpected id 0 for osm primitive found"
-msgstr ""
-"E'' stato trovato un identificativo 0 non atteso per una primitiva osm"
+msgstr "E'' stato trovato un identificativo 0 non atteso per una primitiva osm"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:102
@@ -14833,5 +14816,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:112
 msgid "Download skipped"
-msgstr ""
+msgstr "Scaricamento non eseguito"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:118
@@ -14873,6 +14856,5 @@
 msgid_plural ""
 "The following plugins are no longer necessary and have been deactivated:"
-msgstr[0] ""
-"L'estensione seguente non è più necessaria ed è stata disattivata:"
+msgstr[0] "L'estensione seguente non è più necessaria ed è stata disattivata:"
 msgstr[1] ""
 "Le estensioni seguenti non sono più necessarie e sono state disattivate:"
@@ -14886,7 +14868,6 @@
 msgstr ""
 "<html>E'' stato richiesto il caricamento dell''estensione \"{0}\".<br>Questa "
-"estensione non è più sviluppata e molto probabilmente produrrà degli "
-"errori.<br>Dovrebbe essere disabilitata.<br>Eliminarla dalle "
-"preferenze?</html>"
+"estensione non è più sviluppata e molto probabilmente produrrà degli errori."
+"<br>Dovrebbe essere disabilitata.<br>Eliminarla dalle preferenze?</html>"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:167
@@ -14978,6 +14959,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 ""
 "<html>L''estensione {0} richiede la versione {1} di JOSM. La versione "
@@ -14988,6 +14969,5 @@
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr ""
-"Non è possibile caricare il plugin {0}. Cancellarlo dalle preferenze?"
+msgstr "Non è possibile caricare il plugin {0}. Cancellarlo dalle preferenze?"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:382
@@ -15213,6 +15193,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 ""
 "Attenzione: Fallita la ricerca delle informazioni sull''estensione nel file "
@@ -15222,4 +15201,5 @@
 msgid "Processing plugin site cache icon files..."
 msgstr ""
+"Elaborazione dei file delle icone sul sito di cache del plugin in corso..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:133
@@ -15286,5 +15266,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"
@@ -15359,7 +15339,7 @@
 "the server URL in your preferences and your internet connection.</html>"
 msgstr ""
-"<html>Fallita l''inizializzazione della comunicazione con il server OSM "
-"{0}.<br>Controllare l''indirizzo URL del server nelle preferenze personali e "
-"la propria connessione ad internet.</html>"
+"<html>Fallita l''inizializzazione della comunicazione con il server OSM {0}."
+"<br>Controllare l''indirizzo URL del server nelle preferenze personali e la "
+"propria connessione ad internet.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
@@ -15383,8 +15363,7 @@
 "reference to relation {0}, and upload again.</html>"
 msgstr ""
-"<html><strong>Fallita</strong> l''eliminazione della <strong>relazione "
-"{0}</strong>. E'' ancora collegata alla relazione {1}.<br>Caricare la "
-"relazione {1}, rimuovere il riferimento alla relazione {0}, e "
-"riprovare.</html>"
+"<html><strong>Fallita</strong> l''eliminazione della <strong>relazione {0}</"
+"strong>. E'' ancora collegata alla relazione {1}.<br>Caricare la relazione "
+"{1}, rimuovere il riferimento alla relazione {0}, e riprovare.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:105
@@ -15392,6 +15371,6 @@
 msgid ""
 "<html>Uploading to the server <strong>failed</strong> because your "
-"current<br>dataset violates a precondition.<br>The error message "
-"is:<br>{0}</html>"
+"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
+"html>"
 msgstr ""
 "<html>Upload <strong>failed</strong> verso il server poiché il dataset "
@@ -15401,7 +15380,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 ""
 "<html>E'' fallita l''autenticazione al server OSM con il nome utente "
@@ -15412,7 +15391,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 ""
 "<html>E'' fallita l''autenticazione con il server OSM con il token OAuth "
@@ -15423,8 +15402,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 ""
 "<html>E'' faliita l''autorizzazione al server OSM con il token OAuth "
@@ -15450,11 +15429,11 @@
 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 ""
 "<html>E'' fallita la comunicazione con il server OSM ''{0}''. Il server ha "
-"risposto<br>con l''errore seguente:<br><strong>Codice errore:<strong> "
-"{1}<br><strong>Messaggio di errore (non tradotto)</strong>: {2}</html>"
+"risposto<br>con l''errore seguente:<br><strong>Codice errore:<strong> {1}"
+"<br><strong>Messaggio di errore (non tradotto)</strong>: {2}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:212
@@ -15464,6 +15443,6 @@
 "already been closed.</html>"
 msgstr ""
-"<html>Fallita la chiusura dell''insieme di modifiche "
-"<strong>{0}</strong><br>perché è stato già chiuso.</html>"
+"<html>Fallita la chiusura dell''insieme di modifiche <strong>{0}</"
+"strong><br>perché è stato già chiuso.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
@@ -15473,6 +15452,6 @@
 "already been closed on {1}.</html>"
 msgstr ""
-"<html>Fallita la chiusura dell''insieme di modifiche "
-"<strong>{0}</strong><br>perché è stato già chiuso il {1}.</html>"
+"<html>Fallita la chiusura dell''insieme di modifiche <strong>{0}</"
+"strong><br>perché è stato già chiuso il {1}.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:227
@@ -15495,6 +15474,6 @@
 "already been closed on {1}.</html>"
 msgstr ""
-"<html>Fallito il caricamento sul gruppo di modifiche "
-"<strong>{0}</strong><br>perché è stato già chiuso il {1}.</html>"
+"<html>Fallito il caricamento sul gruppo di modifiche <strong>{0}</"
+"strong><br>perché è stato già chiuso il {1}.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
@@ -15516,7 +15495,6 @@
 "check your internet connection.</html>"
 msgstr ""
-"<html>Fallita l''apertura della connessione al server "
-"remoto<br>''''{0}''''.<br>Controllare la propria connessione ad "
-"internet.</html>"
+"<html>Fallita l''apertura della connessione al server remoto<br>''''{0}''''."
+"<br>Controllare la propria connessione ad internet.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:321
@@ -15527,6 +15505,6 @@
 msgstr ""
 "<html>Fallito il caricamento o lo scaricamento dei dati "
-"da<br>''''{0}''''<br>a causa di un problema con il loro "
-"trasferimento.<br>Dettagli (non tradotti): {1}</html>"
+"da<br>''''{0}''''<br>a causa di un problema con il loro trasferimento."
+"<br>Dettagli (non tradotti): {1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:336
@@ -15543,23 +15521,21 @@
 #, java-format
 msgid ""
-"<html>The OSM server<br>''{0}''<br>reported an internal server "
-"error.<br>This is most likely a temporary problem. Please try again "
-"later.</html>"
+"<html>The OSM server<br>''{0}''<br>reported an internal server error."
+"<br>This is most likely a temporary problem. Please try again later.</html>"
 msgstr ""
 "<html>Il server OSM<br>''''{0}''''<br>ha riportato un errore interno al "
-"server.<br>Solitamente questo è un problema temporaneo. Riprovare più "
-"tardi.</html>"
+"server.<br>Solitamente questo è un problema temporaneo. Riprovare più tardi."
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
-msgstr ""
-"Il server OSM ''''{0}'''' ha riportato una richiesta non corretta.<br>"
+msgstr "Il server OSM ''''{0}'''' ha riportato una richiesta non corretta.<br>"
 
 #: ../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 ""
 "La zona che si è tentato di scaricare è troppo estesa oppure la propria "
@@ -15594,8 +15570,8 @@
 "preferences and your internet connection.</html>"
 msgstr ""
-"<html>Fallita l''apertura della connessione al server "
-"remoto<br>''''{0}''''.<br>Il nome dell''host ''''{1}'''' non può essere "
-"risolto. <br>Controllare l''indirizzo URL delle API nelle proprie preferenze "
-"e la propria connessione ad internet.</html>"
+"<html>Fallita l''apertura della connessione al server remoto<br>''''{0}''''."
+"<br>Il nome dell''host ''''{1}'''' non può essere risolto. <br>Controllare "
+"l''indirizzo URL delle API nelle proprie preferenze e la propria connessione "
+"ad internet.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:487
@@ -15604,12 +15580,12 @@
 "<html>The server reports that an object is deleted.<br><strong>Uploading "
 "failed</strong> if you tried to update or delete this object.<br> "
-"<strong>Downloading failed</strong> if you tried to download this "
-"object.<br><br>The error message is:<br>{0}</html>"
+"<strong>Downloading failed</strong> if you tried to download this object."
+"<br><br>The error message is:<br>{0}</html>"
 msgstr ""
 "<html>Il server segnala che un oggetto è stato eliminato.<br><strong>Il "
 "caricamento è fallito</strong> se si è tentato di aggiornare o eliminare "
 "questo oggetto.<br> <strong>Lo scaricamento è fallito</strong> se si è "
-"tentato di scaricare questo oggetto.<br><br>Il messaggio d''errore "
-"è:<br>{0}</html>"
+"tentato di scaricare questo oggetto.<br><br>Il messaggio d''errore è:<br>{0}"
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/I18n.java:439
@@ -15683,6 +15659,6 @@
 "\n"
 msgstr ""
-"L''impostazione della scorciatoia da tastiera ''{0}'' per l''azione ''{1}'' "
-"({2}) è fallita\n"
+"L''impostazione della scorciatoia da tastiera ''{0}'' per l''azione "
+"''{1}'' ({2}) è fallita\n"
 "perché la scorciatoia è già impegnata dall''azione ''{3}'' ({4}).\n"
 "\n"
@@ -15707,6 +15683,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
-msgstr ""
-"(Suggerimento: Si possono modificare le scorciatoie nelle preferenze.)"
+msgstr "(Suggerimento: Si possono modificare le scorciatoie nelle preferenze.)"
 
 #: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:56
@@ -15880,6 +15855,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304
 msgid "Upload failed. Server returned the following message: "
-msgstr ""
-"Caricamento fallito. Il server ha risposto con il seguente messaggio: "
+msgstr "Caricamento fallito. Il server ha risposto con il seguente messaggio: "
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:346
@@ -16078,6 +16052,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1343
 msgid "Starting address number must be less than ending address number"
-msgstr ""
-"Il numero iniziale dell''indirizzo deve essere minore di quello finale"
+msgstr "Il numero iniziale dell''indirizzo deve essere minore di quello finale"
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:34
@@ -16172,6 +16145,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>"
@@ -16185,6 +16158,6 @@
 "</span><span style=\"font-size: medium;\"><br>\n"
 "...da chiamare piuttosto <br>\n"
-"estensione <span style=\"font-size: "
-"large;\">AlignWayS(egments)</span>...</span>\n"
+"estensione <span style=\"font-size: large;\">AlignWayS(egments)</span>...</"
+"span>\n"
 "</div>\n"
 "</html>"
@@ -16223,6 +16196,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"
@@ -16284,6 +16257,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"
@@ -16298,6 +16271,6 @@
 "rendere parallelo il segmento di riferimento con il segmento da allineare, "
 "quest''ultimo ruoterà attorno a questo punto. Si possono selezionare le due "
-"estremità oppure il centro del segmento <b><i><span "
-"style=\"color:green\">cliccando</span></i></b> nelle vicinanze. \n"
+"estremità oppure il centro del segmento <b><i><span style=\"color:green"
+"\">cliccando</span></i></b> nelle vicinanze. \n"
 "  </li>\n"
 "</ul>\n"
@@ -16312,7 +16285,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"
@@ -16325,7 +16298,7 @@
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Allineare i segmenti.</b> Premere <b><i><span "
-"style=\"color:green\">Shift-A</span></i></b>. In alternativa si può usare il "
-"comando presente nel menu <b>Strumenti</b>\n"
+"  <li><b>Allineare i segmenti.</b> Premere <b><i><span style=\"color:green"
+"\">Shift-A</span></i></b>. In alternativa si può usare il comando presente "
+"nel menu <b>Strumenti</b>\n"
 " oppure si può aggiungere l''azione alla <b>barra degli strumenti</b>.\n"
 "  </li>\n"
@@ -16349,6 +16322,6 @@
 "<div style=\"font-family:sans-serif\">\n"
 "<b>Ultimo consiglio:</b> Volendo c''è un metodo semplice per lavorare sulla "
-"selezione corrente: <b><i><span style=\"color:green\">Alt-"
-"Click</span></i></b> su un qualsiasi punto della mappa.\n"
+"selezione corrente: <b><i><span style=\"color:green\">Alt-Click</span></i></"
+"b> su un qualsiasi punto della mappa.\n"
 "</div>\n"
 "</html>\n"
@@ -16383,9 +16356,29 @@
 msgstr "Numeri:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:134
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#, fuzzy
+msgid "Big buildings mode"
+msgstr "Imposta dimensione degli edifici"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#, fuzzy
+msgid "Rotate crosshair"
+msgstr "Ruota a destra"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#, fuzzy
+msgid "Advanced settings"
+msgstr "Configura le impostazioni avanzate"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#, fuzzy
+msgid "Building tag:"
+msgstr "Palazzo"
+
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:234
 msgid "Cannot place building outside of the world."
 msgstr "Impossibile posizionare l'edificio fuori dal mondo."
 
-#: ../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"
@@ -16394,35 +16387,48 @@
 #: ../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 "Imposta dimensione degli edifici"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:24
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
 msgid "Use Address dialog"
 msgstr "Usa la finestra Indirizzo"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#, fuzzy
+msgid "Auto-select building"
+msgstr "Crea edificio"
+
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
 msgid "Buildings width:"
 msgstr "Larghezza edifici:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Length step:"
 msgstr "Passo di lunghezza:"
 
-#: ../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
+#, fuzzy
+msgid "Advanced..."
+msgstr "Avanzate"
+
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:65
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 msgid "Draw buildings"
 msgstr "Disegna edifici"
 
-#: ../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"
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:379
+#, fuzzy
+msgid "Point on the corner of the building to start drawing"
+msgstr "Indicare un angolo dell'edificio per iniziare"
+
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:381
+#, fuzzy
+msgid "Point on opposite end of the building"
 msgstr "Punta su un'estremità opposta dell'edificio"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
-msgid "Set width of building"
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:383
+#, fuzzy
+msgid "Set width of the building"
 msgstr "Imposta la larghezza dell'edificio"
 
@@ -16614,7 +16620,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--waterway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -16624,5 +16630,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -16632,5 +16638,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -16646,5 +16652,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -16654,5 +16660,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -16660,8 +16666,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 "acqua"
@@ -16683,5 +16689,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -16690,5 +16696,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -16697,5 +16703,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -16704,5 +16710,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -16711,5 +16717,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -16718,10 +16724,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 "indirizzo"
@@ -16750,20 +16756,17 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
-"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>before any upload of data created by this plugin."
-msgstr ""
-"Un gestore speciale del wms francese del catasto all''indirizzo "
-"www.cadastre.gouv.fr<BR><BR>Leggere i Termini e Condizioni d''Uso qui (in "
-"francese): <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>prima di effettuare qualsiasi caricamento di dati creati da questa "
-"estensione."
+"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 ""
+"Un gestore speciale del wms francese del catasto all''indirizzo www.cadastre."
+"gouv.fr<BR><BR>Leggere i Termini e Condizioni d''Uso qui (in francese): "
+"<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>prima di effettuare qualsiasi "
+"caricamento di dati creati da questa estensione."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98
@@ -16967,6 +16970,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:221
 msgid "Please, enable auto-sourcing and check cadastre millesime."
-msgstr ""
-"Abilitare la sorgente automatica e controllare l''annata del catasto."
+msgstr "Abilitare la sorgente automatica e controllare l''annata del catasto."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66
@@ -17227,6 +17229,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 "Livello vuoto"
@@ -17416,4 +17418,52 @@
 msgstr "Non è stato trovato alcun livello dei dati GPX."
 
+#: ../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 "Modifica zoo"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#, fuzzy
+msgid "Name:"
+msgstr "Nome"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#, fuzzy
+msgid "CmdLine:"
+msgstr "Coordinate:"
+
+#: ../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
+#, fuzzy, java-format
+msgid "Delete tool \"{0}\"?"
+msgstr "Cancella nodo {0}"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:74
+msgid "Are you sure?"
+msgstr "Sei sicuro?"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
+#, fuzzy
+msgid "New tool..."
+msgstr "Nuova regola"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
+#, fuzzy
+msgid "Install"
+msgstr "Industriale"
+
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
 msgid "Position only"
@@ -17683,5 +17733,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#. 
+#.
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -17802,6 +17852,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 ""
 "Numero massimo di segmenti permesso per ogni percorso generato. Predefinito "
@@ -17826,7 +17875,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 ""
 "Accuratezza della semplificazione lineare di Douglas-Peucker, misurata in "
@@ -17883,6 +17931,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "A plugin to trace water bodies on Landsat imagery."
-msgstr ""
-"Una estensione per tracciare le superfici acquee su immagini Landsat."
+msgstr "Una estensione per tracciare le superfici acquee su immagini Landsat."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:87
@@ -18129,7 +18176,7 @@
 "new server? (Strongly recommended)</html>"
 msgstr ""
-"<html>L''estensione openstreetbugs sta utilizzando il vecchio server "
-"appspot.com.<br>E'' disponibile un nuovo server su schokokeks.org.<br>Si "
-"vuole migrare al nuovo server? (Fortemente consigliato)</html>"
+"<html>L''estensione openstreetbugs sta utilizzando il vecchio server appspot."
+"com.<br>E'' disponibile un nuovo server su schokokeks.org.<br>Si vuole "
+"migrare al nuovo server? (Fortemente consigliato)</html>"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:109
@@ -18157,6 +18204,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 ""
 "L''intestazione contiene troppi valori e non è possibile mapparla su una "
@@ -18272,6 +18318,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 ""
 "Sono presenti dei cambiamenti non salvati nella propria coda. Si desidera "
@@ -18326,6 +18371,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 ""
 "Scrivi le informazioni sulla posizione nelle intestazioni exif dei seguenti "
@@ -18680,13 +18724,13 @@
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
 msgid "Revert changeset fully"
-msgstr ""
+msgstr "Ripristinare completamente il changeset"
 
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert selection only"
-msgstr ""
+msgstr "Ripristinare solo la selezione"
 
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
 msgid "Revert selection and restore deleted objects"
-msgstr ""
+msgstr "Ripristinare la selezione e gli oggetti cancellati"
 
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
@@ -18700,5 +18744,5 @@
 msgstr "Ripristina"
 
-#: ../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}"
@@ -18747,5 +18791,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:75
 msgid "Downloading changeset"
-msgstr ""
+msgstr "Scaricamento del changeset"
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:98
@@ -18753,4 +18797,41 @@
 msgid "Revert changeset #{0}"
 msgstr "Ripristina il gruppo di modifiche #{0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:78
+#, fuzzy
+msgid "Road Sign Plugin"
+msgstr "Caricamento estensioni"
+
+#: ../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 "Impossibile leggere la lista delle etichette preimpostate: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
+#, fuzzy, java-format
+msgid "Error parsing tagging preset from ''{0}'':\n"
+msgstr "Analisi della lista delle estensioni dal sito ''''{0}''''"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:104
+#, fuzzy, java-format
+msgid "Sign {0}"
+msgstr "Selezione: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:111
+#, fuzzy, java-format
+msgid "Additional sign {0}"
+msgstr "Aggiungi relazione {0}"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -18775,6 +18856,5 @@
 #, java-format
 msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-"Rimuovi il percorso ''{0}'' alla posizione {1} dalla relazione ''{2}''"
+msgstr "Rimuovi il percorso ''{0}'' alla posizione {1} dalla relazione ''{2}''"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RemoveRelationMemberCommand.java:72
@@ -18859,4 +18939,15 @@
 msgstr "Inserire i valori di peso"
 
+#: ../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 "Semplifica percorso"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
+#, fuzzy
+msgid "Delete unnecessary nodes from an area."
+msgstr "Elimina i nodi non necessari dal percorso."
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
 msgid "Slippy Map"
@@ -19263,6 +19354,6 @@
 "relation representing this turn restriction."
 msgstr ""
-"Nella tabella seguente si possono modificare le <strong>etichette "
-"grezze</strong> della relazione OSM che rappresenta questo divieto di svolta."
+"Nella tabella seguente si possono modificare le <strong>etichette grezze</"
+"strong> della relazione OSM che rappresenta questo divieto di svolta."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/AdvancedEditorPanel.java:62
@@ -19271,6 +19362,6 @@
 "OSM relation representing this turn restriction."
 msgstr ""
-"Nella tabella seguente si possono modificare i <strong>membri "
-"grezzi</strong> della relazione OSM che rappresenta questo divieto di svolta."
+"Nella tabella seguente si possono modificare i <strong>membri grezzi</"
+"strong> della relazione OSM che rappresenta questo divieto di svolta."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
@@ -19321,6 +19412,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:167
 msgid "Move the selected relation members down by one position"
-msgstr ""
-"Sposta i membri della relazione selezionati in basso di una posizione"
+msgstr "Sposta i membri della relazione selezionati in basso di una posizione"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:194
@@ -19385,6 +19475,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:411
 msgid "Save the turn restriction despite of errors and/or warnings"
-msgstr ""
-"Salva il divieto di svolta nonostante gli errori e/o gli avvertimenti"
+msgstr "Salva il divieto di svolta nonostante gli errori e/o gli avvertimenti"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:415
@@ -19454,6 +19543,6 @@
 "<html>Questo divieto di svolta è stato modificato al di fuori di questo "
 "editor.<br>Non è possibile applicare le proprie modifiche e continuare con "
-"le modifiche.<br><br>Si desidera creare un conflitto e chiudere "
-"l''editor?</html>"
+"le modifiche.<br><br>Si desidera creare un conflitto e chiudere l''editor?</"
+"html>"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:627
@@ -19463,7 +19552,6 @@
 "resolve this conflict first, then try again.</html>"
 msgstr ""
-"<html>Il livello ''{0}'' contiene già un conflitto per "
-"l''oggetto<br>''{1}''.<br>Si prega di risolvere prima questo conflitto, e "
-"poi di riprovare.</html>"
+"<html>Il livello ''{0}'' contiene già un conflitto per l''oggetto<br>''{1}''."
+"<br>Si prega di risolvere prima questo conflitto, e poi di riprovare.</html>"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:633
@@ -19703,6 +19791,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 ""
 "Lo sviluppo dell''estensione per i divieti di svolta è sponsorizzato da <a "
@@ -19802,13 +19890,13 @@
 #, 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."
-msgstr ""
-"Questo divieto di svolta utilizza il percorso OSM <span class=\"object-"
-"name\">{0}</span> con ruolo <tt>from</tt> <strong>e</strong> con ruolo "
-"<tt>to</tt>. In un divieto di svolta il percorso con ruolo <tt>from</tt> "
-"dovrebbe essere differente dal percorso con ruolo <tt>to</tt>."
+"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 ""
+"Questo divieto di svolta utilizza il percorso OSM <span class=\"object-name"
+"\">{0}</span> con ruolo <tt>from</tt> <strong>e</strong> con ruolo <tt>to</"
+"tt>. In un divieto di svolta il percorso con ruolo <tt>from</tt> dovrebbe "
+"essere differente dal percorso con ruolo <tt>to</tt>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:37
@@ -19852,8 +19940,8 @@
 "only. Please select one in the Basic editor."
 msgstr ""
-"Questo divieto di svolta utilizza un tipo di divieto non-standard "
-"<tt>{0}</tt> per l''etichetta chiave <tt>restriction</tt>. Si consiglia di "
-"utilizzare solamente i valori standard. Si prega di selezionarne uno "
-"nell''editor di base."
+"Questo divieto di svolta utilizza un tipo di divieto non-standard <tt>{0}</"
+"tt> per l''etichetta chiave <tt>restriction</tt>. Si consiglia di utilizzare "
+"solamente i valori standard. Si prega di selezionarne uno nell''editor di "
+"base."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IllegalRestrictionTypeError.java:36
@@ -19868,14 +19956,14 @@
 "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 ""
 "Il percorso <strong>from</strong> <span class=\"object-name\">{0}</span> ed "
 "il percorso <strong>to</strong> <span class=\"object-name\">{1}</span> si "
-"intersecano sul nodo <span class=\"object-name\">{2}</span> ma <span "
-"class=\"object-name\">{2}</span> non è un oggetto <strong>via</strong>.<br> "
-"Si consiglia di impostare <span class=\"object-name\">{2}</span> come un "
+"intersecano sul nodo <span class=\"object-name\">{2}</span> ma <span class="
+"\"object-name\">{2}</span> non è un oggetto <strong>via</strong>.<br> Si "
+"consiglia di impostare <span class=\"object-name\">{2}</span> come un "
 "oggetto <strong>via</strong> unico."
 
@@ -19992,8 +20080,8 @@
 "connects to way <span class=\"object-name\">{3}</span>."
 msgstr ""
-"Il percorso OSM <span class=\"object-name\">{0}</span> con ruolo "
-"<tt>{1}</tt> dovrebbe essere diviso in corrispondenza del nodo <span "
-"class=\"object-name\">{2}</span> dove si connette con il percorso <span "
-"class=\"object-name\">{3}</span>."
+"Il percorso OSM <span class=\"object-name\">{0}</span> con ruolo <tt>{1}</"
+"tt> dovrebbe essere diviso in corrispondenza del nodo <span class=\"object-"
+"name\">{2}</span> dove si connette con il percorso <span class=\"object-name"
+"\">{3}</span>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
@@ -20008,18 +20096,18 @@
 #, java-format
 msgid ""
-"This turn restriction uses the OSM node <span class=\"object-"
-"name\">{0}</span> as member with role <tt>{1}</tt>."
-msgstr ""
-"Questo divieto di svolta utilizza il nodo OSM <span class=\"object-"
-"name\">{0}</span> come membro avente ruolo <tt>{1}</tt>."
+"This turn restriction uses the OSM node <span class=\"object-name\">{0}</"
+"span> as member with role <tt>{1}</tt>."
+msgstr ""
+"Questo divieto di svolta utilizza il nodo OSM <span class=\"object-name\">{0}"
+"</span> come membro avente ruolo <tt>{1}</tt>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:51
 #, java-format
 msgid ""
-"This turn restriction uses the OSM relation <span class=\"object-"
-"name\">{0}</span> as member with role <tt>{1}</tt>."
-msgstr ""
-"Questo divieto di svolta utilizza la relazione OSM <span class=\"object-"
-"name\">{0}</span> come membro avente ruolo <tt>{1}</tt>."
+"This turn restriction uses the OSM relation <span class=\"object-name\">{0}</"
+"span> as member with role <tt>{1}</tt>."
+msgstr ""
+"Questo divieto di svolta utilizza la relazione OSM <span class=\"object-name"
+"\">{0}</span> come membro avente ruolo <tt>{1}</tt>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:57
@@ -20696,11 +20784,10 @@
 #: ../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."
-msgstr ""
-"Sorgente (URL o nome del file) del controllo ortografico (vedi "
-"http://wiki.openstreetmap.org/index.php/User:JLS/speller) o file dati per il "
-"controllo delle etichette."
+"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
+"org/index.php/User:JLS/speller) or tag checking data files."
+msgstr ""
+"Sorgente (URL o nome del file) del controllo ortografico (vedi http://wiki."
+"openstreetmap.org/index.php/User:JLS/speller) o file dati per il controllo "
+"delle etichette."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
@@ -20836,6 +20923,6 @@
 msgid "The \"from\" way does not start or end at a \"via\" node"
 msgstr ""
-"Il percorso \"from\" non inizia né finisce in corrispondenza di un nodo "
-"\"via\""
+"Il percorso \"from\" non inizia né finisce in corrispondenza di un nodo \"via"
+"\""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:143
@@ -20908,9 +20995,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 "area"
@@ -21013,12 +21100,149 @@
 msgstr "{0}, ..."
 
-#: ../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
+#, fuzzy, java-format
+msgid "{0} {1}% of GPS track"
+msgstr "{0} copertura {1}% della traccia GPS"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
 msgid "Shows current position in the video"
 msgstr "Visualizza la posizione corrente nel video"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:113
+#, fuzzy
+msgid "Import Video"
+msgstr "Importa l''audio"
+
+#: ../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 "Elimina"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
+#, fuzzy
+msgid "removes current video from layer"
+msgstr "Rimuovi la fotografia dal layer"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
+#, fuzzy
+msgid "play/pause"
+msgstr "Esegui/Pausa"
+
+#: ../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 "sfondo"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
+#, fuzzy
+msgid "jumps n sec back"
+msgstr "Torna indietro"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "forward"
+msgstr "Avanti"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "jumps n sec forward"
+msgstr "Salta Avanti"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
+#, fuzzy
+msgid "faster"
+msgstr "Più veloce"
+
+#: ../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 "Più lento"
+
+#: ../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 "Permetti l''aggiunta di marcatori/nodi alle posizioni gps correnti."
+
+#. 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
+#, fuzzy
+msgid "Jump length"
+msgstr "Salta lì"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#, fuzzy
+msgid "Set the length of a jump"
+msgstr "Imposta la lingua"
+
+#: ../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
+#, fuzzy
+msgid "Loop length"
+msgstr "Lunghezza"
+
+#: ../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
+#, fuzzy
+msgid "deinterlacing using linear interpolation"
+msgstr "Interpolazione zoom immagine:"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:99
+#, fuzzy
+msgid "play"
+msgstr "layer"
+
+#: ../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 ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -21082,6 +21306,6 @@
 msgid "<html>Could not find a unique node to start downloading from.</html>"
 msgstr ""
-"<html>Impossibile trovare un nodo unico da cui iniziare lo "
-"scaricamento.</html>"
+"<html>Impossibile trovare un nodo unico da cui iniziare lo scaricamento.</"
+"html>"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:119
@@ -21256,9 +21480,9 @@
 "Potrebbero essere presenti errori nelle coordinate."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
 msgid "Automatic downloading"
 msgstr "Scaricamento automatico"
 
-#: ../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}''"
@@ -21267,9 +21491,9 @@
 "non corretto ''{0}''"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:105
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
 msgid "(deactivated)"
 msgstr "(disattivato)"
 
-#: ../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}"
@@ -21277,10 +21501,10 @@
 "Livello WMS ({0}), scaricamento automatico al livello di ingrandimento {1}"
 
-#: ../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 "Livello WMS ({0}), scaricamento per il livello di ingrandimento {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
 #, java-format
 msgid ""
@@ -21296,17 +21520,17 @@
 "WMS?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Yes, fetch images"
 msgstr "Si, preleva le immagini"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Invalid URL?"
 msgstr "Indirizzo URL non valido?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311
 msgid "Download visible tiles"
 msgstr "Scarica i tasselli visibili"
 
-#: ../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"
@@ -21315,97 +21539,97 @@
 "visuale, oppure di cambiare la risoluzione"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329
 msgid "Change resolution"
 msgstr "Cambia risoluzione"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341
 msgid "Reload erroneous tiles"
 msgstr "Ricarica i tasselli non corretti"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385
 msgid "Save WMS layer to file"
 msgstr "Salva il livello WMS su file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
 msgid "Save WMS layer"
 msgstr "Salva livello WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413
 msgid "Load WMS layer from file"
 msgstr "Carica il livello WMS da file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
 msgid "Load WMS layer"
 msgstr "Carica livello WMS"
 
-#: ../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 "Versione del file WMS non supportata; trovata {0}, attesa {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
 msgid "File Format Error"
 msgstr "Errore nel formato del file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449
 msgid "Error loading file"
 msgstr "Errore durante il caricamento del file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463
 msgid "Set WMS Bookmark"
 msgstr "Imposta segnalibro WMS"
 
-#: ../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 "Apri un livello WMS vuoto per caricare i dati da file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
 msgid "WMS Plugin Preferences"
 msgstr "Preferenze dell''estensione WMS"
 
-#: ../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 ""
 "Modifica la lista dei server WMS mostrata nel menù dell''estensione WMS"
 
-#: ../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 "Nome del Menu"
 
-#: ../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 "URL WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "Menu Name (Default)"
 msgstr "Nome del menu (predefinito)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "WMS URL (Default)"
 msgstr "URL WMS (Predefinito)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:86
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
 msgid "Enter a menu name and WMS URL"
 msgstr "Inserire un nome per il menù e un URL WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:111
 msgid "Copy Selected Default(s)"
 msgstr "Copia il predefinito selezionato"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
 msgid "Please select at least one row to copy."
 msgstr "Selezionare almeno una riga da copiare."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
 msgid "Downloader:"
 msgstr "Downloader:"
@@ -21422,4 +21646,9 @@
 msgid "% of north:"
 msgstr "% nord:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186
+#, fuzzy
+msgid "Simultaneous connections"
+msgstr "Nodo: connessione"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -21431,7 +21660,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
@@ -21486,8 +21715,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 "foresta"
@@ -21504,7 +21733,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--boundary tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -21514,5 +21743,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -21555,5 +21784,5 @@
 #. color boundary
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -21563,5 +21792,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -21571,5 +21800,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -21579,15 +21808,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 "confine"
@@ -21603,5 +21832,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -21610,7 +21839,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--route tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -21620,5 +21849,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -21628,5 +21857,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -21636,5 +21865,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -21644,5 +21873,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -21652,5 +21881,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -21660,5 +21889,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -21668,12 +21897,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 "itinerario"
@@ -21921,6 +22150,6 @@
 "E'' usato per passare su uno sfondo bianco con colori abbinati in modo da "
 "rendere la visualizzazione migliore sotto la luce del sole. Vedere la "
-"schermata tra le preferenze di JOSM e le ''Impostazioni della mappa'' "
-"(strano ma vero :-)"
+"schermata tra le preferenze di JOSM e le ''Impostazioni della "
+"mappa'' (strano ma vero :-)"
 
 #. Plugin Create_grid_of_ways
@@ -21967,7 +22196,6 @@
 
 #. 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 ""
 "Scarica direttamente in JOSM i punti GPS dal registratore di dati Globalsat "
@@ -21975,5 +22203,5 @@
 
 #. Plugin graphview
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:28
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
@@ -21981,10 +22209,10 @@
 
 #. Plugin grid
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:30
 msgid "Provide a background layer that displays a map grid"
 msgstr "Fornisce un livello di sfondo che visualizza una griglia di mappa"
 
 #. 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 "
@@ -21998,10 +22226,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:34
 msgid "Helps vectorizing WMS images."
 msgstr "Aiuta nella vettorizzazione delle immagini WMS."
 
 #. 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."
@@ -22011,5 +22239,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 "
@@ -22023,15 +22251,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 "Aggiunge divieti di svolta a sinistra per insiemi di 4 o 5 percorsi"
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:42
 msgid "Simply convert an area to a multipolygon."
 msgstr "Converti semplicemente un''area in un multi-poligono."
 
 #. Plugin multipoly
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:44
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -22042,5 +22270,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 "
@@ -22054,15 +22282,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:48
 msgid "Displays an OpenLayers background image"
 msgstr "Visualizza una immagine di sfondo OpenLayers"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:50
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importa le segnalazioni da OpenStreetBugs"
 
 #. 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"
@@ -22072,5 +22300,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."
@@ -22080,5 +22308,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 "
@@ -22089,5 +22317,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 "
@@ -22098,10 +22326,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Il grande aspetto e stile JGoodies Plastic."
 
 #. 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."
@@ -22111,15 +22339,16 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "Let other applications send commands to JOSM."
 msgstr "Permetti alle altre applicazioni di inviare comandi a JOSM."
 
 #. Plugin reverter
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:66
 msgid "Plugin for reverting changesets"
 msgstr "Estensione per il ripristino dei gruppi di modifiche"
 
+#. 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 "
@@ -22131,10 +22360,17 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:71
 msgid "Provides routing capabilities."
 msgstr "Fornisce funzioni di navigazione"
 
+#. 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 "
@@ -22145,15 +22381,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:77
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Permetti l''aggiunta di marcatori/nodi alle posizioni gps correnti."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:79
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Fornisce un''interfaccia per l''editing dei tag in forma tabulare"
 
 #. 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 "
@@ -22167,10 +22403,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:83
 msgid "Make terraced houses out of single blocks."
 msgstr "Costruisce un complesso di edifici a partire da singoli blocchi."
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:85
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -22182,5 +22418,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) "
@@ -22191,5 +22427,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:89
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -22201,10 +22437,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:91
 msgid "Allows undeleting object from OSM database"
 msgstr "Permette di ripristinare un oggetto dal database di OSM"
 
 #. 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 "
@@ -22216,5 +22452,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 "
@@ -22227,5 +22463,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:97
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -22237,5 +22473,5 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:99
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
@@ -22243,10 +22479,10 @@
 
 #. Plugin wayselector
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:101
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Seleziona una sequenza di percorsi connessi non ramificati"
 
 #. 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 "
@@ -22257,5 +22493,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:105
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -23147,10 +23383,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 "rotatoria"
@@ -23287,8 +23523,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"/>
@@ -23498,5 +23734,5 @@
 #. color motorroad
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -23506,5 +23742,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -23523,5 +23759,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -23531,5 +23767,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -23548,5 +23784,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -23556,5 +23792,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -23573,5 +23809,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -23581,5 +23817,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -23594,5 +23830,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -23610,8 +23846,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 "residenziale"
@@ -23626,5 +23862,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -23633,5 +23869,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--public_transport tags -->
 #. <rule>
@@ -23641,10 +23877,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 "strada di servizio"
@@ -23659,5 +23895,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -23666,5 +23902,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -23674,10 +23910,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 "construction"
@@ -24683,9 +24919,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 "palude alluvionale"
@@ -25015,5 +25251,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -25023,5 +25259,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -25031,5 +25267,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -25039,5 +25275,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -25047,5 +25283,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -25055,5 +25291,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -25063,5 +25299,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -25072,5 +25308,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -25078,9 +25314,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 "ferrovia"
@@ -26490,5 +26726,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -26498,5 +26734,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -26506,5 +26742,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -26514,5 +26750,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -26876,7 +27112,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--sport tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -26886,5 +27122,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -26894,5 +27130,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -26902,5 +27138,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -26910,5 +27146,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -26918,5 +27154,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -26926,5 +27162,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -26934,5 +27170,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -26942,5 +27178,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -26950,5 +27186,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -26958,5 +27194,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -26966,5 +27202,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -26974,5 +27210,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -26982,5 +27218,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -26990,5 +27226,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -26998,5 +27234,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -27006,5 +27242,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -27014,5 +27250,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -27022,5 +27258,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -27030,5 +27266,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -27038,5 +27274,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -27046,5 +27282,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -27054,5 +27290,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -27062,5 +27298,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -27070,5 +27306,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -27078,5 +27314,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -27086,5 +27322,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -27094,5 +27330,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -27102,5 +27338,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -27110,5 +27346,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -27118,5 +27354,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -27126,5 +27362,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -27134,5 +27370,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -27142,5 +27378,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -27150,5 +27386,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -27158,5 +27394,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -27166,5 +27402,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -27174,5 +27410,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -27182,5 +27418,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -27190,5 +27426,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -27198,5 +27434,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -27206,5 +27442,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -27214,5 +27450,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -27222,5 +27458,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -27230,5 +27466,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -27238,5 +27474,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -27246,33 +27482,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 "sport"
@@ -28950,7 +29186,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--landuse tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -28960,5 +29196,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -28968,5 +29204,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -28976,5 +29212,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -28984,5 +29220,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -28992,5 +29228,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -29000,5 +29236,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -29008,5 +29244,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -29016,12 +29252,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 "verde"
@@ -30438,5 +30674,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -30452,5 +30688,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -30460,18 +30696,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 -->
@@ -30480,7 +30733,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- cycleway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -30490,5 +30743,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -30498,5 +30751,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -30506,5 +30759,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -30514,12 +30767,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 "bicicletta"
@@ -30546,5 +30800,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -30560,5 +30814,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -30568,5 +30822,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -30575,13 +30829,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"/>
@@ -30592,11 +30854,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 "pedone"
@@ -30615,8 +30878,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 "metropolitana"
@@ -30728,9 +30991,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
@@ -30738,5 +31001,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,
@@ -30746,8 +31009,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
@@ -30761,5 +31024,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#. 
+#.
 #: build/trans_style.java:72
 msgid "standard"
@@ -30767,5 +31030,5 @@
 
 #. mappaint style named "standard"
-#. 
+#.
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -30814,6 +31077,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>
@@ -30893,5 +31156,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -30901,16 +31164,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 "deprecato"
@@ -30921,5 +31184,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -30928,5 +31191,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -30935,5 +31198,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -30949,5 +31212,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -30961,5 +31224,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -30968,5 +31231,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -30975,5 +31238,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -30982,5 +31245,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -30989,5 +31252,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -30996,5 +31259,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -31003,5 +31266,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxweight"/>
@@ -31010,5 +31273,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxheight"/>
@@ -31017,5 +31280,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -31024,5 +31287,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxlength"/>
@@ -31031,5 +31294,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -31038,5 +31301,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="minspeed"/>
@@ -31045,5 +31308,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxstay"/>
@@ -31052,5 +31315,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="toll"/>
@@ -31059,5 +31322,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="barrier"/>
@@ -31234,7 +31497,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- highway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -31248,5 +31511,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -31256,7 +31519,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- tracktype tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -31266,5 +31529,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -31274,5 +31537,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -31282,5 +31545,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -31290,10 +31553,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 "tracciato stradale"
@@ -31304,5 +31567,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -31311,5 +31574,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -31319,5 +31582,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -31326,5 +31589,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -31333,5 +31596,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -31340,5 +31603,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -31347,5 +31610,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -31354,5 +31617,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -31361,5 +31624,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -31368,5 +31631,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -31375,5 +31638,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -31382,8 +31645,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 "stazione di servizio"
@@ -31394,8 +31657,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 "guado"
@@ -31406,5 +31669,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -31413,8 +31676,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 "slargo per inversione di marcia"
@@ -31425,9 +31688,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 "punto di accesso di emergenza"
@@ -31438,9 +31701,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 "sponda"
@@ -31451,8 +31714,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 "torrente"
@@ -31463,8 +31726,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 "darsena"
@@ -31475,5 +31738,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -31482,5 +31745,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -31489,5 +31752,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -31497,5 +31760,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -31504,5 +31767,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -31511,5 +31774,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -31518,5 +31781,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -31526,5 +31789,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -31535,5 +31798,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -31543,7 +31806,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--man_made tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -31553,5 +31816,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -31561,5 +31824,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -31569,5 +31832,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -31578,5 +31841,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -31585,5 +31848,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -31593,5 +31856,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -31601,5 +31864,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -31609,5 +31872,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -31617,5 +31880,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -31625,5 +31888,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -31633,5 +31896,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -31641,5 +31904,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -31649,5 +31912,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -31657,18 +31920,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 "costruzioni umane"
@@ -31678,9 +31941,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 "rapide"
@@ -31691,7 +31954,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- railway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -31701,5 +31964,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -31708,5 +31971,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -31716,5 +31979,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -31723,5 +31986,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -31731,5 +31994,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -31739,10 +32002,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 "punto ferroviario"
@@ -31753,5 +32016,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -31762,13 +32025,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 "altro ferrovia"
 
 #. color otherrail
-#: build/trans_style.java:1192
+#: build/trans_style.java:1217
 msgid "railover"
 msgstr "ferrovia (sopra)"
@@ -31779,5 +32042,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -31787,5 +32050,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -31798,5 +32061,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -31804,7 +32067,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 "vecchia ferrovia"
@@ -31815,5 +32078,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -31822,5 +32085,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -31829,5 +32092,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -31836,7 +32099,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aeroway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -31847,9 +32110,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 "aeroporto"
@@ -31860,8 +32123,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 "terminal aeroportuale"
@@ -31872,5 +32135,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -31880,8 +32143,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 "aeroporto (scuro)"
@@ -31892,8 +32155,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 "aeroporto (chiaro)"
@@ -31904,5 +32167,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -31911,5 +32174,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -31918,7 +32181,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aerialway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -31928,5 +32191,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -31936,5 +32199,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -31944,5 +32207,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -31952,5 +32215,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -31960,10 +32223,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 "struttura_di_risalita"
@@ -31974,11 +32237,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 "pista_facile"
@@ -31989,9 +32252,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 "pista_intermedia"
@@ -32002,9 +32265,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 "pista_avanzata"
@@ -32015,9 +32278,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 "pista esperto"
@@ -32028,9 +32291,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 "pista libera"
@@ -32041,9 +32304,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 "pista_principiante"
@@ -32054,7 +32317,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--power tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -32064,5 +32327,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -32071,5 +32334,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -32079,5 +32342,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -32087,5 +32350,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -32095,5 +32358,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -32103,5 +32366,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -32111,5 +32374,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -32119,5 +32382,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -32127,5 +32390,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -32135,5 +32398,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -32143,5 +32406,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -32151,5 +32414,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -32159,15 +32422,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 "elettricità"
@@ -32177,9 +32440,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 "pontile"
@@ -32190,8 +32453,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 "conduttura"
@@ -32201,7 +32464,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--leisure tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -32211,5 +32474,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -32219,5 +32482,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -32227,5 +32490,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -32235,5 +32498,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -32243,5 +32506,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -32251,5 +32514,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -32259,5 +32522,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -32267,5 +32530,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -32275,5 +32538,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -32283,5 +32546,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -32291,5 +32554,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -32299,5 +32562,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -32307,5 +32570,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -32315,5 +32578,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -32323,5 +32586,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -32331,17 +32594,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 "struttura per lo svago"
@@ -32351,9 +32614,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 "porto turistico"
@@ -32363,7 +32626,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--amenity tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -32373,5 +32636,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -32381,5 +32644,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -32389,5 +32652,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -32397,5 +32660,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -32405,5 +32668,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -32413,5 +32676,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -32421,5 +32684,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -32429,5 +32692,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -32437,5 +32700,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -32445,14 +32708,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 "struttura di servizio"
@@ -32462,5 +32725,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -32470,5 +32733,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -32478,5 +32741,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -32486,5 +32749,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -32494,5 +32757,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -32502,5 +32765,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -32510,5 +32773,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -32518,5 +32781,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -32526,5 +32789,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -32534,5 +32797,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -32542,5 +32805,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -32550,14 +32813,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 "servizio al traffico"
@@ -32567,5 +32830,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -32574,5 +32837,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -32582,5 +32845,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -32589,5 +32852,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -32597,5 +32860,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -32605,5 +32868,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -32613,5 +32876,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -32620,5 +32883,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -32628,5 +32891,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -32636,5 +32899,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -32644,5 +32907,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -32652,5 +32915,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -32659,5 +32922,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -32666,5 +32929,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -32673,5 +32936,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -32680,5 +32943,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -32687,5 +32950,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -32694,5 +32957,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -32701,5 +32964,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -32708,5 +32971,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -32715,5 +32978,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -32722,5 +32985,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -32729,5 +32992,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -32736,5 +32999,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -32743,5 +33006,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -32751,5 +33014,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -32759,5 +33022,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -32767,5 +33030,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -32775,5 +33038,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -32783,5 +33046,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -32791,5 +33054,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -32799,5 +33062,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -32807,5 +33070,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -32815,5 +33078,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -32824,5 +33087,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -32832,5 +33095,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -32840,5 +33103,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -32848,5 +33111,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -32856,5 +33119,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -32864,5 +33127,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -32872,5 +33135,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -32880,5 +33143,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -32888,5 +33151,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -32896,5 +33159,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -32904,5 +33167,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -32912,5 +33175,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -32920,5 +33183,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -32928,5 +33191,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -32936,5 +33199,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -32944,5 +33207,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"/>
@@ -32952,5 +33223,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -32960,5 +33231,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -32968,5 +33239,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -32976,5 +33247,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -32983,27 +33254,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 "struttura di servizio (chiaro)"
@@ -33013,5 +33285,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -33021,5 +33293,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -33029,12 +33301,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 "acqua (chiaro)"
@@ -33044,5 +33316,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -33052,5 +33324,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -33060,5 +33332,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -33068,5 +33340,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -33076,5 +33348,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -33084,5 +33356,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -33092,11 +33364,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 "salute"
@@ -33106,7 +33378,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--shop tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -33116,5 +33388,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -33124,5 +33396,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -33132,5 +33404,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -33140,5 +33412,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -33148,5 +33420,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -33156,5 +33428,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -33164,5 +33436,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -33172,5 +33444,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -33180,5 +33452,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -33188,5 +33460,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -33196,5 +33468,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -33204,5 +33476,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -33212,5 +33484,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -33220,5 +33492,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -33228,5 +33500,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -33236,5 +33508,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -33244,5 +33516,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -33252,5 +33524,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -33260,5 +33532,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -33268,5 +33540,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -33276,5 +33548,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -33284,5 +33556,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -33292,5 +33564,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -33300,5 +33572,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -33308,5 +33580,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -33316,5 +33588,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -33324,5 +33596,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -33332,5 +33604,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -33340,5 +33612,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -33348,5 +33620,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -33356,5 +33628,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -33364,5 +33636,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -33372,5 +33644,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -33380,5 +33652,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -33388,5 +33660,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -33396,5 +33668,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -33404,5 +33676,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -33412,5 +33684,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -33420,5 +33692,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -33428,5 +33700,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -33436,5 +33708,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -33444,31 +33716,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 "negozio"
@@ -33478,7 +33750,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--tourism tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -33488,5 +33760,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -33496,5 +33768,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -33504,5 +33776,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -33512,5 +33784,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -33520,5 +33792,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -33528,5 +33800,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -33536,12 +33808,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 "hotel"
@@ -33551,5 +33823,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -33559,5 +33831,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -33567,5 +33839,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -33575,5 +33847,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -33583,5 +33855,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -33591,5 +33863,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -33600,5 +33872,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -33608,5 +33880,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- information tags -->
 #. <rule>
@@ -33616,5 +33888,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -33624,5 +33896,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -33631,5 +33903,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -33638,13 +33910,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 "turismo"
@@ -33654,7 +33926,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--historic tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -33664,5 +33936,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -33672,5 +33944,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -33680,5 +33952,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -33688,5 +33960,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -33696,5 +33968,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -33704,5 +33976,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -33712,5 +33984,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -33720,5 +33992,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -33728,13 +34000,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 "attrazione storica"
@@ -33744,8 +34016,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 "cava/miniera"
@@ -33756,8 +34028,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 "discarica"
@@ -33768,5 +34040,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -33776,8 +34048,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 "bacino"
@@ -33788,8 +34060,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 "aia"
@@ -33800,6 +34072,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
-#. 
+#.
+#.
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -33809,8 +34081,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 "area commerciale (negozi)"
@@ -33821,8 +34093,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 "industriale"
@@ -33833,8 +34105,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 "ridestinazione d''uso"
@@ -33845,8 +34117,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 "area agricola destinata alla costruzione"
@@ -33857,8 +34129,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 "area ferroviaria"
@@ -33869,5 +34141,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -33877,7 +34149,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--military tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -33887,5 +34159,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -33895,5 +34167,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -33903,5 +34175,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -33911,11 +34183,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 "militare"
@@ -33926,8 +34198,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 "cimitero"
@@ -33937,8 +34209,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 "picco montuoso"
@@ -33949,9 +34221,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 "ghiacciaio"
@@ -33961,9 +34233,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 "vulcano"
@@ -33973,5 +34245,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -33982,5 +34254,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -33990,5 +34262,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -33998,5 +34270,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -34006,5 +34278,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -34014,12 +34286,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 "elemento naturale"
@@ -34029,9 +34301,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 "boscaglia"
@@ -34041,9 +34313,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 "brughiera"
@@ -34053,9 +34325,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 "area boschiva non gestita"
@@ -34065,9 +34337,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 "zona fangosa (sabbie mobili)"
@@ -34077,9 +34349,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 "spiaggia"
@@ -34090,5 +34362,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?
@@ -34114,5 +34386,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -34123,11 +34395,11 @@
 #. </rule>
 #. -->
-#. 
+#.
 #. <!--name tags -->
-#. 
+#.
 #. <!--preferences tags -->
-#. 
+#.
 #. <!--place tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -34137,5 +34409,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -34145,5 +34417,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -34153,5 +34425,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -34161,5 +34433,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -34169,5 +34441,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -34177,5 +34449,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -34185,5 +34457,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -34193,5 +34465,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -34201,5 +34473,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -34209,5 +34481,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -34217,5 +34489,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -34225,15 +34497,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 "luogo"
@@ -34243,9 +34515,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 "dati tiger"
@@ -34336,5 +34608,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#. 
+#.
 #. Data type can be:
 #. node        - a node point
@@ -34342,28 +34614,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
@@ -34478,5 +34750,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#. 
+#.
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -34489,5 +34761,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>
@@ -34512,6 +34784,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#. 
-#. 
+#.
+#.
 #. only for Germany
 #: build/trans_wms.java:17
@@ -34520,6 +34792,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#. 
-#. 
+#.
+#.
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -34534,6 +34806,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
@@ -34547,6 +34819,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
@@ -34566,6 +34838,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#. 
-#. 
+#.
+#.
 #. only for Japan
 #: build/trans_wms.java:39
@@ -34589,6 +34861,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
@@ -34601,4 +34873,14 @@
 msgstr "Sicilia - Italia"
 
+#~ 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 ""
+#~ "L''oggetto di destinazione con identificativo {0} e versione {1} è "
+#~ "visibile, mentre l''oggetto sorgente con versione precedente {2} non è "
+#~ "visibile. Non è possibile gestire questa inconsistenza. Verrà mantenuto "
+#~ "l''oggetto di destinazione. "
+
 #~ msgid "No data imported."
 #~ msgstr "Nessun dato importato."
@@ -34638,5 +34920,4 @@
 #~ msgstr "Cambia"
 
-#, java-format
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Risolvere {0} conflitti in {1} oggetti"
@@ -34654,5 +34935,4 @@
 #~ msgstr "falso"
 
-#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -34679,6 +34959,6 @@
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version selected "
-#~ "in the history list."
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
 #~ msgstr ""
 #~ "Riporta lo stato di tutti gli oggetti correntemente selezionati alla "
@@ -34717,8 +34997,7 @@
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
 #~ msgstr ""
-#~ "Per spostare, ingrandire e rimpicciolire la mappa puoi usare il mouse oppure "
-#~ "premere Ctrl e le frecce, il punto (.) e la virgola (,)."
-
-#, java-format
+#~ "Per spostare, ingrandire e rimpicciolire la mappa puoi usare il mouse "
+#~ "oppure premere Ctrl e le frecce, il punto (.) e la virgola (,)."
+
 #~ msgid "Images for {0}"
 #~ msgstr "Immagini per {0}"
@@ -34727,9 +35006,7 @@
 #~ msgstr "Leggi GPX..."
 
-#, java-format
 #~ msgid "No time for point {0} x {1}"
 #~ msgstr "Informazioni di tempo non disponibili per il punto {0} x {1}"
 
-#, java-format
 #~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
 #~ msgstr "Impossibile leggere il tempo \"{0}\" per il punto {1} x {2}"
@@ -34738,13 +35015,10 @@
 #~ msgstr "Non è stata trovata nessuna immagine con una data leggibile."
 
-#, java-format
 #~ msgid "GPS start: {0}"
 #~ msgstr "GPS inizio: {0}"
 
-#, java-format
 #~ msgid "GPS end: {0}"
 #~ msgstr "GPS fine: {0}"
 
-#, java-format
 #~ msgid "current delta: {0}s"
 #~ msgstr "differenza attuale: {0}s"
@@ -34758,5 +35032,4 @@
 #~ msgstr[1] "immagini"
 
-#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} in questa traccia."
@@ -34765,9 +35038,7 @@
 #~ msgstr "Sincronizza tempo"
 
-#, java-format
 #~ msgid "The date in file \"{0}\" could not be parsed."
 #~ msgstr "Impossibile leggere la data nel file \"{0}\"."
 
-#, java-format
 #~ msgid "There is no EXIF time within the file \"{0}\"."
 #~ msgstr "Orario non presente nei dati EXIF del file \"{0}\"."
@@ -34789,5 +35060,6 @@
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you load\n"
+#~ "Parameters are read in the order they are specified, so make sure you "
+#~ "load\n"
 #~ "some data before --selection"
 #~ msgstr ""
@@ -34845,8 +35117,7 @@
 #~ msgid "Hint: Some changes came from uploading new data to the server."
 #~ msgstr ""
-#~ "Suggerimento: alcuni cambiamenti derivano dal caricamento dei nuovi dati sul "
-#~ "server."
-
-#, java-format
+#~ "Suggerimento: alcuni cambiamenti derivano dal caricamento dei nuovi dati "
+#~ "sul server."
+
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Impossibile scaricare il plugin: {0} da {1}"
@@ -34867,5 +35138,4 @@
 #~ msgstr "Unire i nodi con diffenti appartenenze?"
 
-#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Errore durante il caricamento della pagina {0}"
@@ -34878,6 +35148,6 @@
 
 #~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this as "
-#~ "a bug."
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
 #~ msgstr ""
 #~ "Errore Interno: impossibile controllare le condizioni dei layer. Segnala "
@@ -34937,8 +35207,9 @@
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still want "
-#~ "to merge them?"
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
 #~ msgstr ""
-#~ "I nodi selezionati appartengono a relazioni differenti. Vuoi comunque unirli?"
+#~ "I nodi selezionati appartengono a relazioni differenti. Vuoi comunque "
+#~ "unirli?"
 
 #~ msgid "Expected closing parenthesis."
@@ -34975,6 +35246,6 @@
 #~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
 #~ msgstr ""
-#~ "<html>Posso fare una fotografia al mio ricevitore GPS.<br>Può questo essere "
-#~ "di aiuto?</html>"
+#~ "<html>Posso fare una fotografia al mio ricevitore GPS.<br>Può questo "
+#~ "essere di aiuto?</html>"
 
 #~ msgid "GPX Track loaded"
@@ -35017,5 +35288,4 @@
 #~ msgstr "Convalida la selezione corrente oppure tutto l'insieme dei dati."
 
-#, java-format
 #~ msgid "Use preset ''{0}''"
 #~ msgstr "Usa la preimpostazione ''{0}''"
@@ -35025,6 +35295,6 @@
 
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want to "
-#~ "combine them?"
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
 #~ msgstr ""
 #~ "I percorsi selezionati appartengono a relazioni differenti. Vuoi comunque "
@@ -35043,12 +35313,7 @@
 #~ msgstr "errore nel caricamento dei metadati"
 
-#~ msgid "Are you sure?"
-#~ msgstr "Sei sicuro?"
-
-#, java-format
 #~ msgid "rectifier id={0}"
 #~ msgstr "identificativo rectifier={0}"
 
-#, java-format
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "Usa la preimpostazione \"{0}\" del gruppo \"{1}\""
@@ -35068,11 +35333,10 @@
 
 #~ 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 ""
-#~ "L'attivazione delle estensioni aggiornate è fallita. Controllare se JOSM ha "
-#~ "i permessi per sovrascrivere quelle esistenti."
-
-#, java-format
+#~ "L'attivazione delle estensioni aggiornate è fallita. Controllare se JOSM "
+#~ "ha i permessi per sovrascrivere quelle esistenti."
+
 #~ msgid "Downloaded plugin information from {0} site"
 #~ msgid_plural "Downloaded plugin information from {0} sites"
@@ -35080,5 +35344,4 @@
 #~ msgstr[1] "Informazioni sulle estensioni scaricate da {0} siti"
 
-#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -35090,5 +35353,4 @@
 #~ "{0}"
 
-#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Estensione non trovata: {0}."
@@ -35134,5 +35396,4 @@
 #~ msgstr "Cycleway"
 
-#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "L'estensione richiede l'aggiornamento di JOSM: {0}."
@@ -35152,6 +35413,6 @@
 #~ msgstr ""
 #~ "(Si può modificare il numero di giorni dopo il quale appare questo "
-#~ "avvertimento<br>specificando l'opzione di configurazione "
-#~ "'pluginmanager.warntime'.)"
+#~ "avvertimento<br>specificando l'opzione di configurazione 'pluginmanager."
+#~ "warntime'.)"
 
 #~ msgid "Edit Properties"
@@ -35197,5 +35458,4 @@
 #~ msgstr "Fuso orario del GPS (differenza rispetto alle foto)"
 
-#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Si prega di segnalare il problema a {0}"
@@ -35206,6 +35466,6 @@
 #~ msgid "Include your steps to get to the error (as detailed as possible)!"
 #~ msgstr ""
-#~ "Includi i passi necessari per riprodurre l'errore (il più dettagliatamente "
-#~ "possibile)!"
+#~ "Includi i passi necessari per riprodurre l'errore (il più "
+#~ "dettagliatamente possibile)!"
 
 #~ msgid "Some of the nodes are (almost) in the line"
@@ -35225,9 +35485,9 @@
 
 #~ 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 ""
-#~ "Prova ad aggiornare JOSM e tutte le sue estensioni all'ultima versione prima "
-#~ "di segnalare un problema."
+#~ "Prova ad aggiornare JOSM e tutte le sue estensioni all'ultima versione "
+#~ "prima di segnalare un problema."
 
 #~ msgid "NullPointerException, possibly some missing tags."
@@ -35247,5 +35507,4 @@
 #~ "http://josm.openstreetmap.de/wiki/TaggingPresets per un aiuto."
 
-#, java-format
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "Impossibile leggere \"{0}\""
@@ -35265,6 +35524,6 @@
 
 #~ msgid ""
-#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
-#~ "these will then show up in the WMS menu.\n"
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
 #~ "\n"
 #~ "You can also do this manually in the Advanced Preferences, using the "
@@ -35281,6 +35540,6 @@
 #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
 #~ "only need to input the relevant 'id'.\n"
-#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in "
-#~ "this example,replacing 73 with your image id: \n"
+#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
+#~ "in this example,replacing 73 with your image id: \n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -35292,6 +35551,6 @@
 #~ "preferenze di WMSplugin - queste saranno poi visualizzate nel menu WMS.\n"
 #~ "\n"
-#~ "La stessa cosa può essere fatta anche manualmente nelle preferenze avanzate, "
-#~ "usando il seguente schema:\n"
+#~ "La stessa cosa può essere fatta anche manualmente nelle preferenze "
+#~ "avanzate, usando il seguente schema:\n"
 #~ "wmsplugin.url.1.name=Landsat\n"
 #~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
@@ -35303,9 +35562,9 @@
 #~ "format=image/jpeg \n"
 #~ "\n"
-#~ "Per il rettificatore di mappe Metacarta http://labs.metacarta.com/rectifier/ "
-#~ ", è sufficiente inserire l'identificativo pertinente.\n"
+#~ "Per il rettificatore di mappe Metacarta http://labs.metacarta.com/"
+#~ "rectifier/ , è sufficiente inserire l'identificativo pertinente.\n"
 #~ "Per aggiungere una voce al menù relativo al rettificatore di mappe "
-#~ "Metacarta, creare manualmente l'URL come in questo esempio, sostituendo 73 "
-#~ "con l'identificativo della propria immagine: \n"
+#~ "Metacarta, creare manualmente l'URL come in questo esempio, sostituendo "
+#~ "73 con l'identificativo della propria immagine: \n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -35317,12 +35576,11 @@
 #~ msgstr "Saracinesca"
 
-#, 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 ""
 #~ "Il plugin {0} sembra danneggiato o non è stato possibile scaricarlo "
 #~ "automaticamente."
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -35341,9 +35599,7 @@
 #~ msgstr "Carica su OSM..."
 
-#, java-format
 #~ msgid "Error: {0}"
 #~ msgstr "Errore: {0}"
 
-#, java-format
 #~ msgid "Warning: {0}"
 #~ msgstr "Attenzione: {0}"
@@ -35352,5 +35608,4 @@
 #~ msgstr "Membro vuoto nella relazione."
 
-#, java-format
 #~ msgid "Intersection between ways ''{0}'' and ''{1}''."
 #~ msgstr "Intersezione tra i percorsi ''{0}'' e ''{1}''."
@@ -35371,37 +35626,29 @@
 #~ msgstr "Seleziona i dati dell'utente"
 
-#, java-format
 #~ msgid "No useful role ''{0}'' for Way ''{1}''."
 #~ msgstr "Regola ''{0}'' non utile per il percorso ''{1}''."
 
-#, java-format
 #~ msgid "Style for inner way ''{0}'' equals multipolygon."
-#~ msgstr "Lo stile per il percorso interno ''{0}'' è uguale al multi-poligono."
-
-#, java-format
+#~ msgstr ""
+#~ "Lo stile per il percorso interno ''{0}'' è uguale al multi-poligono."
+
 #~ msgid "Style for outer way ''{0}'' mismatches."
 #~ msgstr "Lo stile per il percorso esterno ''{0}'' è discordante."
 
-#, java-format
 #~ msgid "Non-Way ''{0}'' in multipolygon."
 #~ msgstr "Non-percorso ''{0}'' nel multi-poligono."
 
-#, java-format
 #~ msgid "multipolygon way ''{0}'' is not closed."
 #~ msgstr "il percorso multi-poligonale ''{0}'' non è chiuso."
 
-#, java-format
 #~ msgid "No outer way for multipolygon ''{0}''."
 #~ msgstr "Nessun percorso esterno per il multi-poligono ''{0}''."
 
-#, java-format
 #~ msgid "Way ''{0}'' with less than two points."
 #~ msgstr "Percorso ''{0}'' con meno di due punti."
 
-#, java-format
 #~ msgid "Inner way ''{0}'' is outside."
 #~ msgstr "Il percorso interno ''{0}'' è esterno."
 
-#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Impossibile aprire la cartella delle preferenze: {0}"
@@ -35425,29 +35672,27 @@
 #~ msgstr "Spiacente, ma non funziona con gli utenti anonimi"
 
-#, java-format
 #~ msgid "Parsing error in URL: \"{0}\""
 #~ msgstr "Errore nell'interpretazione dei dati dell'indirizzo URL: \"{0}\""
 
-#, java-format
-#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
+#~ msgid ""
+#~ "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them all?"
+#~ "The selection contains {0} ways. Are you sure you want to simplify them "
+#~ "all?"
 #~ msgstr[0] ""
 #~ "La selezione contiene {0} percorso. Sei sicuro di volerlo semplificare?"
 #~ msgstr[1] ""
-#~ "La selezione contiene {0} percorsi. Sei sicuro di volerli semplificare tutti?"
+#~ "La selezione contiene {0} percorsi. Sei sicuro di volerli semplificare "
+#~ "tutti?"
 
 #~ msgid "Oberpfalz Geofabrik.de"
 #~ msgstr "Geofabrik.de dell'Alto Palatinato"
 
-#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "Autori: {0}"
 
-#, java-format
 #~ msgid "Layers: {0}"
 #~ msgstr "Livelli: {0}"
 
-#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Pila dei comandi: {0}"
@@ -35469,13 +35714,12 @@
 #~ msgstr "Storico dell'elemento"
 
-#, java-format
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr ""
-#~ "E'' stato ignorato un percorso perché include un nodo che non esiste: {0}\n"
+#~ "E'' stato ignorato un percorso perché include un nodo che non esiste: "
+#~ "{0}\n"
 
 #~ msgid "Please select one or more closed ways of at least four nodes."
 #~ msgstr "Selezionare uno o più percorsi chiusi di almeno quattro nodi."
 
-#, java-format
 #~ msgid "Style for restriction {0} not found."
 #~ msgstr "Non è stato trovato lo stile per la restrizione {0}."
@@ -35487,9 +35731,7 @@
 #~ msgstr "Non è stato trovato un percorso \"to\"."
 
-#, java-format
 #~ msgid "Unknown role ''{0}''."
 #~ msgstr "Ruolo ''{0}'' sconosciuto."
 
-#, java-format
 #~ msgid "Unknown member type for ''{0}''."
 #~ msgstr "Tipo di membro sconosciuto per ''{0}''."
@@ -35523,5 +35765,6 @@
 #~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
 #~ msgstr ""
-#~ "Impostare manualmente la zona di Lambert (per posizioni incluse tra due zone)"
+#~ "Impostare manualmente la zona di Lambert (per posizioni incluse tra due "
+#~ "zone)"
 
 #~ msgid "Lambert Zone 3 cache file (.3)"
@@ -35531,5 +35774,4 @@
 #~ msgstr "File cache della zona 2 di Lambert (.2)"
 
-#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "Collegamento a {0} in corso..."
@@ -35541,6 +35783,6 @@
 #~ msgstr "Aggiunta l'auto-etichettatura della sorgente:"
 
-#, java-format
-#~ msgid "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
+#~ msgid ""
+#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
 #~ msgstr ""
 #~ "La zona di Lambert {0} nella cache è incompatibile con la zona di Lambert "
@@ -35553,5 +35795,4 @@
 #~ msgstr "Elimina gli elementi selezionati"
 
-#, java-format
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
 #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
@@ -35576,7 +35817,7 @@
 #~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
 #~ msgstr ""
-#~ "QUESTO E'' SPERIMENTALE. Salva il tuo lavoro e verificalo prima di caricarlo."
-
-#, java-format
+#~ "QUESTO E'' SPERIMENTALE. Salva il tuo lavoro e verificalo prima di "
+#~ "caricarlo."
+
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Editor relazione: {0}"
@@ -35598,5 +35839,4 @@
 #~ msgstr "Sposta in basso"
 
-#, java-format
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
@@ -35609,5 +35849,4 @@
 #~ msgstr "Aggiorna dati"
 
-#, java-format
 #~ msgid "Change the projection to {0} first."
 #~ msgstr "Modificare prima la proiezione in {0}."
@@ -35616,5 +35855,4 @@
 #~ msgstr "Proiezione non valida"
 
-#, java-format
 #~ msgid "Found {0} matches of {1} in GPX track {2}"
 #~ msgstr "Trovate {0} corrispondenze {1} nel tracciato GPX {2}"
@@ -35624,11 +35862,10 @@
 
 #~ msgid ""
-#~ "An error occured while trying to match the photos to the GPX track. You can "
-#~ "adjust the sliders to manually match the photos."
+#~ "An error occured while trying to match the photos to the GPX track. You "
+#~ "can adjust the sliders to manually match the photos."
 #~ msgstr ""
 #~ "Un errore è stato rilevato durante il tentativo di correlare le foto al "
 #~ "tracciato GPX. E' possibile far corrispondere le foto in modo manuale."
 
-#, java-format
 #~ msgid "Offset between track and photos: {0}m {1}s"
 #~ msgstr "Differenza tra il tracciato e le foto: {0}m {1}s"
@@ -35662,5 +35899,6 @@
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data layer?"
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
 #~ msgstr ""
 #~ "Non è stato trovato alcun dato da aggiornare. E' stato già aperto o "
@@ -35690,6 +35928,7 @@
 #~ "import EXIF geotagged pictures."
 #~ msgstr ""
-#~ "Un'altra estensione JOSM per la geo-etichettatura. Correla le immagini con i "
-#~ "tracciati GPS oppure importa le immagini geo-etichettate mediante EXIF."
+#~ "Un'altra estensione JOSM per la geo-etichettatura. Correla le immagini "
+#~ "con i tracciati GPS oppure importa le immagini geo-etichettate mediante "
+#~ "EXIF."
 
 #~ msgid "Directly load TCX files from JOSM."
@@ -35697,14 +35936,14 @@
 
 #~ msgid ""
-#~ "Tools to work with authors/users. Selects map data that belongs to selected "
-#~ "user, opens browser showing selected author profile page."
+#~ "Tools to work with authors/users. Selects map data that belongs to "
+#~ "selected user, opens browser showing selected author profile page."
 #~ msgstr ""
-#~ "Strumenti per lavorare con autori/utenti. Seleziona i dati della mappa che "
-#~ "appartengono ad un utente selezionato, apre il browser per la "
+#~ "Strumenti per lavorare con autori/utenti. Seleziona i dati della mappa "
+#~ "che appartengono ad un utente selezionato, apre il browser per la "
 #~ "visualizzazione della pagina del profilo dell'autore."
 
 #~ msgid ""
-#~ "Several utilities that make your life easier: e.g. simplify way, join areas, "
-#~ "jump to position."
+#~ "Several utilities that make your life easier: e.g. simplify way, join "
+#~ "areas, jump to position."
 #~ msgstr ""
 #~ "Alcune utilità per rendere la propria vita più facile: ad esempio la "
@@ -35713,11 +35952,11 @@
 #~ msgid ""
 #~ "The main feature of the plugin is the possibility to delete points of the "
-#~ "GPX track. This plugin can be used to prepare  tracks for uploading to OSM "
-#~ "eg. deleting uninteresting parts of track."
+#~ "GPX track. This plugin can be used to prepare  tracks for uploading to "
+#~ "OSM eg. deleting uninteresting parts of track."
 #~ msgstr ""
-#~ "La caratteristica principale dell'estensione è la possibilità di eliminare i "
-#~ "punti del tracciato GPX. Questa estensione può essere utilizzata per "
-#~ "preparare i tracciati per il loro caricamento su OSM, ad esempio eliminando "
-#~ "le parti che non interessano di un tracciato."
+#~ "La caratteristica principale dell'estensione è la possibilità di "
+#~ "eliminare i punti del tracciato GPX. Questa estensione può essere "
+#~ "utilizzata per preparare i tracciati per il loro caricamento su OSM, ad "
+#~ "esempio eliminando le parti che non interessano di un tracciato."
 
 #~ msgid "Remove route nodes"
@@ -35727,5 +35966,4 @@
 #~ msgstr "<multiplo>"
 
-#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -35734,6 +35972,6 @@
 #~ "{0}"
 #~ msgstr ""
-#~ "Il file dell''estensione è già disponibile in locale. Desideri scaricare la "
-#~ "versione aggiornata ed eliminare il vecchio archivio?\n"
+#~ "Il file dell''estensione è già disponibile in locale. Desideri scaricare "
+#~ "la versione aggiornata ed eliminare il vecchio archivio?\n"
 #~ "\n"
 #~ "{0}"
@@ -35750,5 +35988,4 @@
 #~ "modifiche"
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -35778,14 +36015,11 @@
 #~ msgstr "% di lon:"
 
-#, java-format
 #~ msgid "Image with path {0} does not exist or is not readable."
 #~ msgstr "L''immagine con il percorso {0} non esiste o non è leggibile."
 
-#, java-format
 #~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
 #~ msgstr ""
 #~ "\"type\" non previsto sul membro {0} della relazione {1}, ottenuto {2}."
 
-#, java-format
 #~ msgid "Resolve conflicts in member list of of relation {0}"
 #~ msgstr "Risolvi conflitti nella lista dei membri della relazione {0}"
@@ -35814,5 +36048,4 @@
 #~ msgstr "Selezionare un nodo iniziale alla fine di un percorso"
 
-#, java-format
 #~ msgid "Plugin {0} requires JOSM update to version {1}."
 #~ msgstr ""
@@ -35872,5 +36105,4 @@
 #~ msgstr "Primitive eliminate o spostate"
 
-#, java-format
 #~ msgid "removing reference from way {0}"
 #~ msgstr "rimozione del riferimento dal percorso {0}"
@@ -35879,24 +36111,21 @@
 #~ msgstr "Nome utente OSM (e-mail)"
 
-#, java-format
 #~ msgid ""
 #~ "Current number of changes exceeds the max. number of changes, current is "
 #~ "{0}, max is {1}"
 #~ msgstr ""
-#~ "Il numero di cambiamenti corrente supera il numero massimo consentito, ora "
-#~ "sono {0}, il massimo è {1}"
+#~ "Il numero di cambiamenti corrente supera il numero massimo consentito, "
+#~ "ora sono {0}, il massimo è {1}"
 
 #~ msgid "Failed to initialize API. Please try again later."
 #~ msgstr "E' fallita l'inizializzazione delle API. Riprovare più tardi."
 
-#, java-format
 #~ msgid "Layer {0} must be in list of layers"
 #~ msgstr "Il livello {0} deve essere presente nella lista dei livelli"
 
-#, java-format
 #~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
 #~ msgstr ""
-#~ "<html>E'' fallito il caricamento dello storico dal server. "
-#~ "Dettagli:<br>{0}</html>"
+#~ "<html>E'' fallito il caricamento dello storico dal server. Dettagli:<br>"
+#~ "{0}</html>"
 
 #~ msgid "Defaults (See tooltip for detailed information)"
@@ -35910,6 +36139,6 @@
 
 #~ msgid ""
-#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
-#~ "these will then show up in the WMS menu.\n"
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
 #~ "\n"
 #~ "You can also do this manually in the Advanced Preferences, using the "
@@ -35925,6 +36154,6 @@
 #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
 #~ "only need to input the relevant 'id'.\n"
-#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in "
-#~ "this example, replacing 73 with your image id:\n"
+#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
+#~ "in this example, replacing 73 with your image id:\n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -35934,5 +36163,6 @@
 #~ msgstr ""
 #~ "Si possono aggiungere, modificare ed eliminare elementi WMS nella scheda "
-#~ "delle preferenze di WMSplugin - questi verranno visualizzati nel menu WMS.\n"
+#~ "delle preferenze di WMSplugin - questi verranno visualizzati nel menu "
+#~ "WMS.\n"
 #~ "\n"
 #~ "Si possono anche aggiungere manualmente nelle Preferenze Avenzate, "
@@ -35948,7 +36178,7 @@
 #~ "Per il Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , è "
 #~ "solo necessario inserire l'identificativo rilevante.\n"
-#~ "Per aggiungere una voce di menu Metacarta Map Rectifier, creare manualmente "
-#~ "l'indirizzo URL come in questo esempio, sostituendo 73 con l'identificativo "
-#~ "della propria immagine:\n"
+#~ "Per aggiungere una voce di menu Metacarta Map Rectifier, creare "
+#~ "manualmente l'indirizzo URL come in questo esempio, sostituendo 73 con "
+#~ "l'identificativo della propria immagine:\n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -35963,26 +36193,22 @@
 #~ msgstr "Ordina i membri della relazione selezionata o l'intera lista"
 
-#, java-format
 #~ msgid "Members: {0} (linked: {1})"
 #~ msgstr "Membri: {0} (collegato: {1})"
 
-#, java-format
 #~ msgid "The XML source (URL or filename) for {0} definition files."
 #~ msgstr ""
-#~ "La sorgente XML (indirizzo URL o nome di file) per i file di definizione di "
-#~ "{0}."
+#~ "La sorgente XML (indirizzo URL o nome di file) per i file di definizione "
+#~ "di {0}."
 
 #~ msgid "No data"
 #~ msgstr "Nessun dato"
 
-#, java-format
 #~ msgid ""
 #~ "WARNING: launching browser windows for the first {0} of {1} selected "
 #~ "primitives only"
 #~ msgstr ""
-#~ "ATTENZIONE: sto aprendo la finestra di visualizzazione solo per le prime {0} "
-#~ "delle {1} primitive selezionate"
-
-#, java-format
+#~ "ATTENZIONE: sto aprendo la finestra di visualizzazione solo per le prime "
+#~ "{0} delle {1} primitive selezionate"
+
 #~ msgid ""
 #~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
@@ -36003,14 +36229,11 @@
 #~ msgstr "Scarica riferimenti da OSM..."
 
-#, java-format
 #~ msgid "Unknown file extension for file ''{0}''"
 #~ msgstr "Estensione del file sconosciuta per il file ''{0}''"
 
-#, java-format
 #~ msgid "An error occurred while saving. Error is: {0}"
 #~ msgstr ""
 #~ "E'' stato generato un errore durante il salvataggio. L''errore è: {0}"
 
-#, java-format
 #~ msgid "Plug-in named {0} is not available. Update skipped."
 #~ msgstr ""
@@ -36019,12 +36242,12 @@
 #~ msgid "The plugin could not be removed. Probably it was already disabled"
 #~ msgstr ""
-#~ "L''estensione non può essere rimossa. Probabilmente è stata già disabilitata"
-
-#, java-format
+#~ "L''estensione non può essere rimossa. Probabilmente è stata già "
+#~ "disabilitata"
+
 #~ msgid ""
 #~ "Loading of {0} plugin was requested. This plugin is no longer required."
 #~ msgstr ""
-#~ "E'' stato richiesto il caricamento dell''estensione {0}. Questa estensione "
-#~ "non è più necessaria."
+#~ "E'' stato richiesto il caricamento dell''estensione {0}. Questa "
+#~ "estensione non è più necessaria."
 
 #~ msgid "Confirmation"
@@ -36038,6 +36261,6 @@
 
 #~ msgid ""
-#~ "Enable to upload all changes in one request, disable to use one request per "
-#~ "changed primitive"
+#~ "Enable to upload all changes in one request, disable to use one request "
+#~ "per changed primitive"
 #~ msgstr ""
 #~ "Abilitare per caricare tutte le modifiche in una sola richiesta, "
@@ -36045,5 +36268,4 @@
 #~ "modificata"
 
-#, java-format
 #~ msgid ""
 #~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
@@ -36051,9 +36273,9 @@
 #~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
 #~ msgstr[0] ""
-#~ "Ci sono dei cambiamenti non salvati nel layer {0}. Ignorare i cambiamenti e "
-#~ "continuare?"
+#~ "Ci sono dei cambiamenti non salvati nel layer {0}. Ignorare i cambiamenti "
+#~ "e continuare?"
 #~ msgstr[1] ""
-#~ "Ci sono dei cambiamenti non salvati nei layer {0}. Ignorare i cambiamenti e "
-#~ "continuare?"
+#~ "Ci sono dei cambiamenti non salvati nei layer {0}. Ignorare i cambiamenti "
+#~ "e continuare?"
 
 #~ msgid "Close current changeset"
@@ -36063,15 +36285,13 @@
 #~ msgstr "Usare un nuovo changset a chiuderlo."
 
-#, java-format
 #~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr "Pagina di help mancante. Creala in <A HREF=\"{0}\">italiano</A>."
 
-#, java-format
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
 #~ msgstr ""
-#~ "Pagina di aiuto mancante. Crearla in <A HREF=\"{0}\">inglese</A> oppure <A "
-#~ "HREF=\"{1}\">nella propria lingua</A>."
+#~ "Pagina di aiuto mancante. Crearla in <A HREF=\"{0}\">inglese</A> oppure "
+#~ "<A HREF=\"{1}\">nella propria lingua</A>."
 
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
@@ -36079,23 +36299,19 @@
 
 #~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
 #~ msgstr ""
-#~ "Pagina di aiuto mancante. crearla in <A HREF=\"{0}\">italiano</A> oppure <A "
-#~ "HREF=\"{1}\">la propria lingua</A>."
-
-#, java-format
+#~ "Pagina di aiuto mancante. crearla in <A HREF=\"{0}\">italiano</A> oppure "
+#~ "<A HREF=\"{1}\">la propria lingua</A>."
+
 #~ msgid "Parameter ''{0}'' must not be null."
 #~ msgstr "il parametro ''{0}'' non deve essere nullo"
 
-#, java-format
 #~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 #~ msgstr "attesa istanza di OsmDataLayer o GpxLayer. Ricevuto \"{0}\"."
 
-#, java-format
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "Valore di ritorno inatteso. Ottenuto {0}"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
 #~ msgstr "è richiesto il parametro {0} > 0. Ottenuto {1}."
@@ -36110,17 +36326,13 @@
 #~ msgstr "non è stata trovata la versione più recente. Lo storico è vuoto."
 
-#, java-format
 #~ msgid "Parameter current out of range. Got {0}."
 #~ msgstr "parametro attualmente fuori scala: ottenuto {0}"
 
-#, java-format
 #~ msgid "Unexpected column index. Got {0}."
 #~ msgstr "indice di colonna non atteso. Ottenuto {0}"
 
-#, java-format
 #~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
 #~ msgstr "Il parametro 'col' deve essere 0 o 1. Ottenuto {0}"
 
-#, java-format
 #~ msgid "Index out of bounds. Got {0}."
 #~ msgstr "indice fuori dai limiti Ottenuto {0}"
@@ -36129,23 +36341,20 @@
 #~ msgstr "Visualizza lo storico della primitiva selezionata"
 
-#, java-format
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Impossibile leggere \"{0}\""
 
-#, java-format
 #~ msgid ""
 #~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
 #~ msgstr ""
-#~ "valore non valido per attributo obbligatorio ''{0}'' di tipo int, ricevuto "
-#~ "''{1}''"
-
-#, java-format
+#~ "valore non valido per attributo obbligatorio ''{0}'' di tipo int, "
+#~ "ricevuto ''{1}''"
+
 #~ msgid ""
-#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
+#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got "
+#~ "''{1}''."
 #~ msgstr ""
 #~ "valore non valido per attributo obbligatorio ''{0}'' di tipo int (>=0), "
 #~ "ricevuto ''{1}''"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 #~ msgstr "era atteso il parametro ''{0}'' >= 0, ottenuto ''{1}''"
@@ -36153,8 +36362,7 @@
 #~ msgid "Replace the way this member refers to with the combined way"
 #~ msgstr ""
-#~ "Sostituisci il percorso a cui fa riferimento questo membro con il percorso "
-#~ "unito"
-
-#, java-format
+#~ "Sostituisci il percorso a cui fa riferimento questo membro con il "
+#~ "percorso unito"
+
 #~ msgid "Expected ID >= 0. Got {0}."
 #~ msgstr "Era atteso ID >= 0. Ottenuto {0}."
@@ -36164,10 +36372,10 @@
 
 #~ msgid ""
-#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
-#~ "the following\n"
+#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to "
+#~ "add the following\n"
 #~ "      Java option to increase the maximum size of allocated memory"
 #~ msgstr ""
-#~ "nota: Per alcune funzionalità JOSM ha bisogno di molta memoria. Può essere "
-#~ "necessario aggiungere la seguente\n"
+#~ "nota: Per alcune funzionalità JOSM ha bisogno di molta memoria. Può "
+#~ "essere necessario aggiungere la seguente\n"
 #~ "      opzione Java per incrementare la dimensione massima della memoria "
 #~ "allocata"
@@ -36182,29 +36390,26 @@
 #~ msgstr "Biciclette"
 
-#, java-format
 #~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-#~ "from relation?</html>"
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
 #~ msgstr ""
 #~ "<html>La selezione \"{0}\" è utilizzata dalla relazione \"{1}\" con ruolo "
 #~ "{2}.<br>Eliminare dalla relazione?</html>"
 
-#, java-format
 #~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
 #~ msgstr ""
 #~ "Errore nella sintassi dello schema: lo schema {0} in {1} non è valido!"
 
-#, java-format
 #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 #~ msgstr ""
-#~ "L'intestazione dell'errore \"{0}\" non corrisponde allo schema atteso \"{1}\""
-
-#, java-format
+#~ "L'intestazione dell'errore \"{0}\" non corrisponde allo schema atteso "
+#~ "\"{1}\""
+
 #~ msgid ""
 #~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
 #~ "relation?</html>"
 #~ msgstr ""
-#~ "<html>La selezione \"{0}\" è utilizzata dalla relazione "
-#~ "\"{1}\".<br>Eliminare dalla relazione?</html>"
+#~ "<html>La selezione \"{0}\" è utilizzata dalla relazione \"{1}\"."
+#~ "<br>Eliminare dalla relazione?</html>"
 
 #~ msgid "Always move and don't show dialog again"
@@ -36214,11 +36419,9 @@
 #~ msgstr "Impossibile effettuare la ricerca perché non ci sono dati caricati."
 
-#, java-format
 #~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 #~ msgstr ""
-#~ "Era atteso che il valore del parametro ''{0}\" fosse nell''intervallo "
-#~ "0..{1}. Ottenuto ''{2}''."
-
-#, java-format
+#~ "Era atteso che il valore del parametro ''{0}\" fosse nell''intervallo 0.."
+#~ "{1}. Ottenuto ''{2}''."
+
 #~ msgid "Parameter ''{0}'' must not be empty."
 #~ msgstr "il parametro ''{0}'' non deve essere vuoto."
@@ -36227,10 +36430,9 @@
 #~ msgstr "Non è stata trovata alcuna versione precedente. Lo storico è vuoto."
 
-#, java-format
 #~ msgid ""
 #~ "<html>There are {0} primitives in your local dataset which<br>might be "
 #~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
-#~ "to check the state of these primitives<br>on the server.<br>Click "
+#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
+#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
 #~ "<strong>{2}</strong> to ignore.<br></html>"
 #~ msgstr ""
@@ -36238,20 +36440,18 @@
 #~ "che<br>dovrebbero essere state eliminate sul server. Se si tentasse "
 #~ "successivamente di eliminarle o<br>aggiornarle è probabile che il server "
-#~ "segnali<br>un conflitto.<br><br>Cliccare <strong>{1}</strong> per verificare "
-#~ "lo stato di queste primitive<br>sul server.<br>Cliccare <strong>{2}</strong> "
-#~ "per ignorare.<br></html>"
-
-#, java-format
+#~ "segnali<br>un conflitto.<br><br>Cliccare <strong>{1}</strong> per "
+#~ "verificare lo stato di queste primitive<br>sul server.<br>Cliccare "
+#~ "<strong>{2}</strong> per ignorare.<br></html>"
+
 #~ msgid ""
 #~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
 #~ msgstr ""
-#~ "Impossibile annullare il comando ''{0}'' perché il livello ''{1}'' non è più "
-#~ "presente"
-
-#, java-format
+#~ "Impossibile annullare il comando ''{0}'' perché il livello ''{1}'' non è "
+#~ "più presente"
+
 #~ msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
-#~ msgstr "Il parametro ''{0}'' non è un nome di tipo valido. Ottenuto ''{1}''."
-
-#, java-format
+#~ msgstr ""
+#~ "Il parametro ''{0}'' non è un nome di tipo valido. Ottenuto ''{1}''."
+
 #~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 #~ msgstr "Il parametro ''{0}'' non è una classe accettata. Ottenuto ''{1}''."
@@ -36262,6 +36462,6 @@
 #~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
 #~ msgstr ""
-#~ "In questo insieme di dati non è stata trovata alcuna primitiva con id {0} e "
-#~ "versione {1}"
+#~ "In questo insieme di dati non è stata trovata alcuna primitiva con id {0} "
+#~ "e versione {1}"
 
 #~ msgid "Didn't find an primitive with id {0} in this dataset"
@@ -36274,17 +36474,13 @@
 #~ "finestra unica,"
 
-#, java-format
 #~ msgid "Relation: from {0} to {1} via {2}"
 #~ msgstr "Relazione: da {0} a {1} tramite {2}"
 
-#, java-format
 #~ msgid "{0} extrem nodes."
 #~ msgstr "{0} nodi estremi."
 
-#, java-format
 #~ msgid "Via node {0}, {1}"
 #~ msgstr "Tramite nodo {0}, {1}"
 
-#, java-format
 #~ msgid "MIddle way: {0}"
 #~ msgstr "Percorso intermedio: {0}"
@@ -36301,54 +36497,49 @@
 #~ msgstr "<html>"
 
-#, java-format
 #~ msgid ""
-#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
-#~ "default geometry. Details: {1}"
+#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back "
+#~ "to default geometry. Details: {1}"
 #~ msgstr ""
 #~ "Attenzione: fallito il ripristino della geometria della finestra dalla "
 #~ "chiave ''''{0}''''. Ritorno alla geometria predefinita. Dettagli: {1}"
 
-#, java-format
 #~ msgid ""
 #~ "<html>Failed to close changeset ''{0}'' on the OSM server ''{1}''.<br>The "
-#~ "changeset will automatically be closed by the server after a timeout.</html>"
+#~ "changeset will automatically be closed by the server after a timeout.</"
+#~ "html>"
 #~ msgstr ""
-#~ "<html>Fallita la chiusura dell''insieme di modifiche ''''{0}'''' sul server "
-#~ "OSM ''''{1}''''.<br>L''insieme di modifiche sarà automaticamente chiuso dal "
-#~ "server dopo un intervallo massimo di attesa.</html>"
+#~ "<html>Fallita la chiusura dell''insieme di modifiche ''''{0}'''' sul "
+#~ "server OSM ''''{1}''''.<br>L''insieme di modifiche sarà automaticamente "
+#~ "chiuso dal server dopo un intervallo massimo di attesa.</html>"
 
 #~ msgid ""
-#~ "WARNING: no API version defined for data to upload. Falling back to version "
-#~ "0.6"
+#~ "WARNING: no API version defined for data to upload. Falling back to "
+#~ "version 0.6"
 #~ msgstr ""
-#~ "ATTENZIONE: non è definita alcuna versione delle API per i dati da caricare. "
-#~ "Ritorno alla versione 0.6"
-
-#, java-format
+#~ "ATTENZIONE: non è definita alcuna versione delle API per i dati da "
+#~ "caricare. Ritorno alla versione 0.6"
+
 #~ msgid ""
 #~ "WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
-#~ "use diff uploads, but API is not able to handle them. Ignoring diff upload."
+#~ "use diff uploads, but API is not able to handle them. Ignoring diff "
+#~ "upload."
 #~ msgstr ""
 #~ "ATTENZIONE: la preferenza ''''{0}'''' o la versione delle API ''''{1}'''' "
-#~ "dell''insieme dei dati richiedono l''utilizzo dei caricamenti differenziali, "
-#~ "ma le API non sono in grado di gestirli. Ignorato il caricamento "
-#~ "differenziale."
-
-#, java-format
+#~ "dell''insieme dei dati richiedono l''utilizzo dei caricamenti "
+#~ "differenziali, ma le API non sono in grado di gestirli. Ignorato il "
+#~ "caricamento differenziale."
+
 #~ msgid ""
 #~ "Unknown relation member type ''{0}'' in relation with external id ''{1}''."
 #~ msgstr ""
-#~ "Tipo di membro di relazione ''''{0}'''' sconosciuto nella relazione con ID "
-#~ "esterno ''''{1}''''."
-
-#, java-format
+#~ "Tipo di membro di relazione ''''{0}'''' sconosciuto nella relazione con "
+#~ "ID esterno ''''{1}''''."
+
 #~ msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 #~ msgstr "Era atteso un parametro ID ''''{0}'''' > 0. Ottenuto ''''{1}''''."
 
-#, java-format
 #~ msgid "Expected instance of OsmDataLayer. Got ''{0}''."
 #~ msgstr "Era attesa una istanza di OsmDataLayer. Ottenuto ''{0}''."
 
-#, java-format
 #~ msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 #~ msgstr "Valore non valido per l''attributo ''''uid''''. Ottenuto ''{0}''."
@@ -36358,5 +36549,4 @@
 #~ "L'insieme di modifiche corrente è nullo. Non si possono caricare i dati."
 
-#, java-format
 #~ msgid "Preset group ''{0}'' of group ''{1}''"
 #~ msgstr "Gruppo di preimpostati ''''{0}'''' del gruppo ''''{1}''''"
@@ -36367,24 +36557,21 @@
 #~ "Hold left mousebutton and draw a frame."
 #~ msgstr ""
-#~ "<b>Ingrandimento:</b> rotellina del mouse, doppio click oppure Ctrl + Su/giu "
-#~ "<b>Spostamento della mappa:</b> tenere premuto il tasto destro del mouse, "
-#~ "muovere il mouse o utilizzare i tasti cursore. <b>Selezione:</b> tenere "
-#~ "premuto il tasto sinistro del mouse e disegnare un riquadro."
-
-#, java-format
+#~ "<b>Ingrandimento:</b> rotellina del mouse, doppio click oppure Ctrl + Su/"
+#~ "giu <b>Spostamento della mappa:</b> tenere premuto il tasto destro del "
+#~ "mouse, muovere il mouse o utilizzare i tasti cursore. <b>Selezione:</b> "
+#~ "tenere premuto il tasto sinistro del mouse e disegnare un riquadro."
+
 #~ msgid "Value of child.getId() > 0 expected. Got {1}."
 #~ msgstr "Era atteso un valore child.getId() > 0. Ottenuto {1}."
 
-#, java-format
 #~ msgid ""
-#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal to "
-#~ "deleting the roles of these primitives.<br>Do you really want to apply the "
-#~ "new role?</html>"
+#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
+#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
+#~ "the new role?</html>"
 #~ msgstr ""
 #~ "<html>Si sta impostando un ruolo vuoto su {0} primitive.<br>Questo è "
-#~ "equivalente all'eliminazione dei ruoli di queste primitive.<br>Si desidera "
-#~ "veramente applicare il nuovo ruolo?</html>"
-
-#, java-format
+#~ "equivalente all'eliminazione dei ruoli di queste primitive.<br>Si "
+#~ "desidera veramente applicare il nuovo ruolo?</html>"
+
 #~ msgid ""
 #~ "<html>Failed to create an URL because the encoding ''{0}'' was<br>was "
@@ -36394,5 +36581,4 @@
 #~ "manca la codifica ''''{0}''''.</html>"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 #~ msgstr ""
@@ -36402,15 +36588,13 @@
 #~ msgid "Failed to read command. Exiting help browser. Exception was:"
 #~ msgstr ""
-#~ "Fallita la lettura del comando. Uscita dal browser di aiuto. L'eccezione è "
-#~ "stata:"
+#~ "Fallita la lettura del comando. Uscita dal browser di aiuto. L'eccezione "
+#~ "è stata:"
 
 #~ msgid "Failed to launch the external help browser"
 #~ msgstr "Fallita l'apertura del browser esterno di aiuto"
 
-#, java-format
 #~ msgid "Object id > 0 expected. Got {0}"
 #~ msgstr "Era atteso un oggetto con id > 0. Ottenuto {0}"
 
-#, java-format
 #~ msgid ""
 #~ "Plugin {0} version {1} found but for this version of JOSM is at least "
@@ -36424,15 +36608,13 @@
 #~ msgstr "Username del server proxy"
 
-#, java-format
 #~ msgid "Id > 0 required, got {0}"
 #~ msgstr "Era richiesto un Id > 0, ottenuto {0}"
 
-#, java-format
 #~ msgid ""
-#~ "<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-#~ "network problem, please check your<br>your internet connection</html>"
+#~ "<html>Failed to open help page for url {0}.<br>This is most likely due to "
+#~ "a network problem, please check your<br>your internet connection</html>"
 #~ msgstr ""
-#~ "<html>Fallita l''apertura della pagina di aiuto per l''indirizzo url "
-#~ "{0}.<br>Tipicamente questo è dovuto a qualche problema di rete, controllare "
+#~ "<html>Fallita l''apertura della pagina di aiuto per l''indirizzo url {0}."
+#~ "<br>Tipicamente questo è dovuto a qualche problema di rete, controllare "
 #~ "la propria<br>connessione ad internet</html>"
 
@@ -36440,5 +36622,4 @@
 #~ msgstr "Imposta manualmente la zona di Lambert"
 
-#, java-format
 #~ msgid ""
 #~ "Current layer is in Lambert CC9 Zone \"{0}\"\n"
@@ -36452,49 +36633,42 @@
 #~ "manualmente la zona di Lambert dal menu Cadastre"
 
-#, java-format
 #~ msgid ""
-#~ "<html><p class=\"warning-header\">Help content for help topic missing</p><p "
-#~ "class=\"warning-body\">Help content for the help topic <strong>{0}</strong> "
-#~ "is not available yet. It is missing both in your local language ({1}) and in "
-#~ "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>"
+#~ "<html><p class=\"warning-header\">Help content for help topic missing</"
+#~ "p><p class=\"warning-body\">Help content for the help topic <strong>{0}</"
+#~ "strong> is not available yet. It is missing both in your local language "
+#~ "({1}) and in 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>"
 #~ msgstr ""
-#~ "<html><p class=\"warning-header\">Manca il contenuto per questo argomento di "
-#~ "aiuto</p><p class=\"warning-body\">Il contenuto per l''argomento di aiuto "
-#~ "<strong>{0}</strong> non è ancora disponibile. Manca per la propria lingua "
-#~ "locale ({1}) e anche per la lingua inglese.<br><br>Aiutateci a migliorare il "
-#~ "sistema di aiuto JOSM e a inserire le informazioni mancanti. Si può "
-#~ "modificare l''argomento di aiuto <a href=\"{2}\">nella propria lingua locale "
-#~ "({1})</a> oppure <a href=\"{3}\">nella lingua inglese</a>.</p></html>"
-
-#, java-format
+#~ "<html><p class=\"warning-header\">Manca il contenuto per questo argomento "
+#~ "di aiuto</p><p class=\"warning-body\">Il contenuto per l''argomento di "
+#~ "aiuto <strong>{0}</strong> non è ancora disponibile. Manca per la propria "
+#~ "lingua locale ({1}) e anche per la lingua inglese.<br><br>Aiutateci a "
+#~ "migliorare il sistema di aiuto JOSM e a inserire le informazioni "
+#~ "mancanti. Si può modificare l''argomento di aiuto <a href=\"{2}\">nella "
+#~ "propria lingua locale ({1})</a> oppure <a href=\"{3}\">nella lingua "
+#~ "inglese</a>.</p></html>"
+
 #~ msgid "Uploading {0} objects ..."
 #~ msgstr "Caricamento di {0} oggetti ..."
 
-#, java-format
 #~ msgid "Expected array of length 4, got {0}"
 #~ msgstr "Era atteso un vettore di lunghezza 4, ottenuto {0}"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' must not be empty"
 #~ msgstr "Il parametro ''''{0}'''' non deve essere vuoto"
 
-#, java-format
 #~ msgid "Failed to load load resource ''{0}''. Error is {1}"
 #~ msgstr "Fallito il caricamento della risorsa ''''{0}''''. L''errore è {1}"
 
-#, java-format
 #~ msgid "Illegal double value ''{0}''"
 #~ msgstr "Valore in doppia precisione ''''{0}'''' non valido"
 
-#, java-format
 #~ msgid "Exactly four doubles excpected in string, got {0}"
 #~ msgstr ""
-#~ "Erano attesi esattamente quattro numeri in doppia precisione nella stringa, "
-#~ "ottenuto {0}"
-
-#, java-format
+#~ "Erano attesi esattamente quattro numeri in doppia precisione nella "
+#~ "stringa, ottenuto {0}"
+
 #~ msgid "{0} Plugin successfully downloaded."
 #~ msgid_plural "{0} Plugins successfully downloaded."
@@ -36509,18 +36683,18 @@
 #~ "E' richiesto almeno un oggetto da eliminare, ottenuta una collezione vuota"
 
-#, java-format
 #~ msgid ""
-#~ "Incorrect value of tags operator: {0}. Tags operator expects number of tags "
-#~ "or range, for example tags:1 or tags:2-5"
+#~ "Incorrect value of tags operator: {0}. Tags operator expects number of "
+#~ "tags or range, for example tags:1 or tags:2-5"
 #~ msgstr ""
-#~ "Valore non corretto per l''operatore tags: {0}. L''operatore tags richiede "
-#~ "il numero di etichette o un intervallo, per esempio tags:1 oppure tags:2-5"
+#~ "Valore non corretto per l''operatore tags: {0}. L''operatore tags "
+#~ "richiede il numero di etichette o un intervallo, per esempio tags:1 "
+#~ "oppure tags:2-5"
 
 #~ msgid ""
-#~ "<html>The merged nodes are members in one ore more relations. Please decide "
-#~ "whether your want to <strong>keep</strong> these memberships for the target "
-#~ "node or whether you want to <strong>remove</strong> them.<br>The default is "
-#~ "to <strong>keep</strong> them: the target node will take the place of the "
-#~ "original node in the membership.</html>"
+#~ "<html>The merged nodes are members in one ore more relations. Please "
+#~ "decide whether your want to <strong>keep</strong> these memberships for "
+#~ "the target node or whether you want to <strong>remove</strong> them."
+#~ "<br>The default is to <strong>keep</strong> them: the target node will "
+#~ "take the place of the original node in the membership.</html>"
 #~ msgstr ""
 #~ "<html>I nodi uniti sono membri di una o più relazioni. Decidere se si "
@@ -36528,20 +36702,20 @@
 #~ "destinazione oppure se si vuole <strong>rimuoverle</strong>.<br>Il "
 #~ "comportamento predefinito è di <strong>mantenerle</strong>: il nodo di "
-#~ "destinazione prenderà il posto del nodo originale nell'appartenenza.</html>"
+#~ "destinazione prenderà il posto del nodo originale nell'appartenenza.</"
+#~ "html>"
 
 #~ msgid ""
-#~ "<html>The combined ways are members in one ore more relations. Please decide "
-#~ "whether your want to <strong>keep</strong> these memberships for the "
-#~ "combined way or whether you want to <strong>remove</strong> them.<br>The "
-#~ "default is to <strong>keep</strong> them: the combined way will take the "
-#~ "place of the original way in the membership.</html>"
+#~ "<html>The combined ways are members in one ore more relations. Please "
+#~ "decide whether your want to <strong>keep</strong> these memberships for "
+#~ "the combined way or whether you want to <strong>remove</strong> them."
+#~ "<br>The default is to <strong>keep</strong> them: the combined way will "
+#~ "take the place of the original way in the membership.</html>"
 #~ msgstr ""
 #~ "<html>I percorsi uniti sono membri di una o più relazioni. Decidere se si "
 #~ "desidera <strong>mantenere</strong> queste appartenenze per il percorso "
 #~ "unito oppure se si vuole <strong>rimuoverle</strong>.<br>Il comportamento "
-#~ "predefinito è di <strong>mantenerle</strong>: il percorso unito prenderà il "
-#~ "posto del percorso originale nell'appartenenza.</html>"
-
-#, java-format
+#~ "predefinito è di <strong>mantenerle</strong>: il percorso unito prenderà "
+#~ "il posto del percorso originale nell'appartenenza.</html>"
+
 #~ msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
 #~ msgstr "Era atteso un parametro ''''{0}'''' > 0.0, ottenuto {1}"
@@ -36552,5 +36726,4 @@
 #~ "differenti"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
 #~ msgstr "Era atteso un parametro ''''{0}'''' > 0, ottenuto {1}"
@@ -36564,9 +36737,7 @@
 #~ msgstr "Apri"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' >= 0 expected, got {1}"
 #~ msgstr "Era atteso il parametro ''''{0}'''' >= 0, ottenuto {1}"
 
-#, java-format
 #~ msgid "Incorrect value of version operator: {0}. Number is expected."
 #~ msgstr ""
@@ -36574,11 +36745,9 @@
 #~ "numero."
 
-#, java-format
 #~ msgid "Incorrect value of changeset operator: {0}. Number is expected."
 #~ msgstr ""
-#~ "Valore non corretto dell''operatore del gruppo di modifiche: {0}. Era atteso "
-#~ "un numero."
-
-#, java-format
+#~ "Valore non corretto dell''operatore del gruppo di modifiche: {0}. Era "
+#~ "atteso un numero."
+
 #~ msgid "Expected integer value > 0 for parameter ''{0}'', got ''{1}''"
 #~ msgstr ""
@@ -36589,9 +36758,7 @@
 #~ msgstr "Inserire un identificativo per il gruppo di modifiche"
 
-#, java-format
 #~ msgid "id in parameter ''{0}'' > 0 expected, got {1}."
 #~ msgstr "atteso id nel parametro ''{0}'' > 0, valore attuale {1}."
 
-#, java-format
 #~ msgid "Parameter ''{0}'' > 0 expected. Got {1}."
 #~ msgstr "Atteso parametro ''{0}'' > 0. Valore attuale {1}."
@@ -36602,26 +36769,26 @@
 #~ msgid " (<a href=\"urn:changeset-configuration\">configure changeset</a>)"
 #~ msgstr ""
-#~ " (<a href=\"urn:changeset-configuration\">configura gruppo di modifiche</a>)"
-
-#, java-format
+#~ " (<a href=\"urn:changeset-configuration\">configura gruppo di modifiche</"
+#~ "a>)"
+
 #~ msgid ""
 #~ "Click ''<strong>{0}</strong>'' to continue uploading to additional new "
 #~ "changsets.<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>"
+#~ "dialog.<br>Click ''<strong>{2}</strong>'' to abort uploading and return "
+#~ "to map editing.<br>"
 #~ msgstr ""
 #~ "Cliccare ''<strong>{0}</strong>'' per continuare il caricamento su nuovi "
 #~ "gruppi di modifiche addizionali.<br>Cliccare ''<strong>{1}</strong>'' per "
-#~ "ritornare alla finestra di caricamento.<br>Cliccare ''<strong>{2}</strong>'' "
-#~ "per interrompere il caricamento e ritornare a modificare la mappa.<br>"
-
-#, java-format
+#~ "ritornare alla finestra di caricamento.<br>Cliccare ''<strong>{2}</"
+#~ "strong>'' per interrompere il caricamento e ritornare a modificare la "
+#~ "mappa.<br>"
+
 #~ msgid ""
 #~ "The server reported that the current changset was closed.<br>This is most "
-#~ "likely because the changesets size exceeded the max. size<br>of {0} objects "
-#~ "on the server ''{1}''."
+#~ "likely because the changesets size exceeded the max. size<br>of {0} "
+#~ "objects on the server ''{1}''."
 #~ msgstr ""
-#~ "Il server ha segnalato che il gruppo di modifiche corrente è stato "
-#~ "chiuso.<br>Questo perché probabilmente la dimensione del gruppo di modifiche "
+#~ "Il server ha segnalato che il gruppo di modifiche corrente è stato chiuso."
+#~ "<br>Questo perché probabilmente la dimensione del gruppo di modifiche "
 #~ "supera il limite massimo<br>di {0} oggetti sul server ''''{1}''''."
 
@@ -36629,13 +36796,11 @@
 #~ msgstr "Ricerca delle traduzioni disponibili..."
 
-#, java-format
 #~ msgid "Delete old plugin file {0}"
 #~ msgstr "Elimina il file della vecchia estensione {0}"
 
-#, java-format
 #~ msgid "Expected value > 0 for parameter ''{0}'', got {1}"
-#~ msgstr "Era atteso un valore  > 0 per il parametro ''''{0}'''', ottenuto {1}"
-
-#, java-format
+#~ msgstr ""
+#~ "Era atteso un valore  > 0 per il parametro ''''{0}'''', ottenuto {1}"
+
 #~ msgid "Parameter ''{0}'' of type node expected, got ''{1}''"
 #~ msgstr "Era atteso un parametro ''''{0}'''' di tipo nodo, ottenuto ''{1}''"
@@ -36647,24 +36812,20 @@
 #~ msgstr "Caricamento delle localizzazioni disponibili..."
 
-#, java-format
 #~ msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}"
 #~ msgstr ""
-#~ "Era atteso un valore di tipo intero lungo > 0 per il parametro ''''{0}'''', "
-#~ "ottenuto {1}"
-
-#, java-format
+#~ "Era atteso un valore di tipo intero lungo > 0 per il parametro "
+#~ "''''{0}'''', ottenuto {1}"
+
 #~ msgid "Expected unique id > 0 for primitive id, got {0}"
 #~ msgstr ""
 #~ "Era atteso un identificativo unico > 0 per la primitiva, ottenuto {0}"
 
-#, java-format
 #~ msgid ""
-#~ "Warning: ignoring changeset id {0} for new object with external id {1} and "
-#~ "internal id {2}"
+#~ "Warning: ignoring changeset id {0} for new object with external id {1} "
+#~ "and internal id {2}"
 #~ msgstr ""
-#~ "Attenzione: ignorato il gruppo di modifiche con id {0} per il nuovo oggetto "
-#~ "con id esterno {1} e con id interno {2}"
-
-#, java-format
+#~ "Attenzione: ignorato il gruppo di modifiche con id {0} per il nuovo "
+#~ "oggetto con id esterno {1} e con id interno {2}"
+
 #~ msgid "Expected value of type integer > 0 for parameter ''{0}'', got {1}"
 #~ msgstr ""
@@ -36672,8 +36833,7 @@
 #~ "ottenuto {1}"
 
-#, java-format
 #~ msgid ""
-#~ "Warning: Failed to retrieve user infos for the current JOSM user. Exceptions "
-#~ "was: {0}"
+#~ "Warning: Failed to retrieve user infos for the current JOSM user. "
+#~ "Exceptions was: {0}"
 #~ msgstr ""
 #~ "Attenzione: non è stato possibile ottenere le informazioni sull''utente "
@@ -36686,5 +36846,4 @@
 #~ msgstr "Non-percorso nel multi-poligono."
 
-#, java-format
 #~ msgid ""
 #~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
@@ -36697,5 +36856,4 @@
 #~ msgstr "Numero errato di parametri per l''operatore tags."
 
-#, java-format
 #~ msgid ""
 #~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
@@ -36705,5 +36863,4 @@
 #~ "richiede un numero o un intervallo di nodi, per esempio nodes:10-20"
 
-#, java-format
 #~ msgid "Incorrect value of id operator: {0}. Number is expected."
 #~ msgstr "Valore non corretto per l''operatore id: {0}. E'' atteso un numero."
@@ -36734,7 +36891,7 @@
 #~ "include all changesets in the query.</html>"
 #~ msgstr ""
-#~ "<html>Selezionare per limitare l''interrogazione solamente sui propri gruppi "
-#~ "di modifiche.<br>Deselezionare per includere tutti i gruppi di modifiche "
-#~ "nell''interrogazione.</html>"
+#~ "<html>Selezionare per limitare l''interrogazione solamente sui propri "
+#~ "gruppi di modifiche.<br>Deselezionare per includere tutti i gruppi di "
+#~ "modifiche nell''interrogazione.</html>"
 
 #~ msgid ""
@@ -36745,16 +36902,16 @@
 
 #~ msgid ""
-#~ "You are about to delete nodes outside of the area you have "
-#~ "downloaded.<br>This can cause problems because other objects (that you don't "
-#~ "see) might use them.<br>Do you really want to delete?"
+#~ "You are about to delete nodes outside of the area you have downloaded."
+#~ "<br>This can cause problems because other objects (that you don't see) "
+#~ "might use them.<br>Do you really want to delete?"
 #~ msgstr ""
-#~ "Stai per cancellare dei nodi fuori dall''area scaricata.<br>Questo potrebbe "
-#~ "causare dei problemi poiché i nodi potrebbero far parte di altri oggetti "
-#~ "(che non puoi vedere).<br>Vuoi veramente cancellarli?"
+#~ "Stai per cancellare dei nodi fuori dall''area scaricata.<br>Questo "
+#~ "potrebbe causare dei problemi poiché i nodi potrebbero far parte di altri "
+#~ "oggetti (che non puoi vedere).<br>Vuoi veramente cancellarli?"
 
 #~ msgid "<html>Cannot open directory.<br>Please select a file!</html>"
 #~ msgstr ""
-#~ "<html>Impossibile aprire una cartella.<br>Si prega di selezionare un "
-#~ "file!</html>"
+#~ "<html>Impossibile aprire una cartella.<br>Si prega di selezionare un file!"
+#~ "</html>"
 
 #~ msgid "GPS point"
Index: /applications/editors/josm/i18n/po/ja.po
===================================================================
--- /applications/editors/josm/i18n/po/ja.po	(revision 21970)
+++ /applications/editors/josm/i18n/po/ja.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-14 03:51+0000\n"
+"POT-Creation-Date: 2010-06-23 22:47+0200\n"
+"PO-Revision-Date: 2010-06-21 03:49+0000\n"
 "Last-Translator: higa4 <higa432@gmail.com>\n"
 "Language-Team: Japanese <tr@openstreetmap.jp>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-06-15 16:17+0000\n"
+"X-Launchpad-Export-Date: 2010-06-23 20:24+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: JAPAN\n"
@@ -26,5 +26,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
@@ -96,5 +96,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
@@ -104,5 +104,6 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:470
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
-msgstr "パラメータ \"downloadgps\" はファイル名もしくはURLとして有効ではありません。"
+msgstr ""
+"パラメータ \"downloadgps\" はファイル名もしくはURLとして有効ではありません。"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:538
@@ -199,6 +200,6 @@
 "page for OSM primitive will probably fail. API base URL is: ''{0}''"
 msgstr ""
-"警告: 予想外のAPI ベースURLのフォーマット。OSM プリミティブの情報や履歴のページにリダイレクトすると、おそらく失敗します。API ベース "
-"URL は \"{0}\" です。"
+"警告: 予想外のAPI ベースURLのフォーマット。OSM プリミティブの情報や履歴のペー"
+"ジにリダイレクトすると、おそらく失敗します。API ベース URL は \"{0}\" です。"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63
@@ -208,6 +209,6 @@
 "user will probably fail. API base URL is: ''{0}''"
 msgstr ""
-"警告: 予想外のAPI ベースURLのフォーマット。OSM ユーザーのページにリダイレクトすると、おそらく失敗します。API ベース URL は "
-"\"{0}\" です。"
+"警告: 予想外のAPI ベースURLのフォーマット。OSM ユーザーのページにリダイレクト"
+"すると、おそらく失敗します。API ベース URL は \"{0}\" です。"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86
@@ -217,5 +218,6 @@
 "screen with browser windows<br>and take some time to finish."
 msgstr ""
-"{0} ブラウザウィンドウを起動しようとしています。<br>画面がブラウザウィンドウで散らかり<br>終わらせるのに少し時間が掛かります。"
+"{0} ブラウザウィンドウを起動しようとしています。<br>画面がブラウザウィンドウ"
+"で散らかり<br>終わらせるのに少し時間が掛かります。"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
@@ -254,5 +256,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
@@ -275,5 +277,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
@@ -281,6 +283,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
@@ -289,4 +293,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
@@ -305,5 +311,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132
 msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "少なくとも一つはアップロード済みのノード・ウェイ・リレーションを選択してください。"
+msgstr ""
+"少なくとも一つはアップロード済みのノード・ウェイ・リレーションを選択してくだ"
+"さい。"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:62
@@ -324,7 +332,9 @@
 #, java-format
 msgid ""
-"<html>There are no layers the source layer<br>''{0}''<br>could be merged "
-"to.</html>"
-msgstr "<html>統合元のレイヤー<br>''{0}''<br>を、統合する先のレイヤーがありません。</html>"
+"<html>There are no layers the source layer<br>''{0}''<br>could be merged to."
+"</html>"
+msgstr ""
+"<html>統合元のレイヤー<br>''{0}''<br>を、統合する先のレイヤーがありません。</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:81
@@ -347,9 +357,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
@@ -409,4 +419,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
@@ -446,5 +457,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 "情報"
@@ -599,5 +610,6 @@
 "Could not combine ways (They could not be merged into a single string of "
 "nodes)"
-msgstr "ウェイを結合できません（これらをノードの一列として統合することができません）"
+msgstr ""
+"ウェイを結合できません（これらをノードの一列として統合することができません）"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
@@ -644,5 +656,7 @@
 "Please select exactly two or three nodes or one way with exactly two or "
 "three nodes."
-msgstr "正確に２つないしは３つのノード、または正確に２つないしは３つのノードを持つ一つのウェイ、を選択してください。"
+msgstr ""
+"正確に２つないしは３つのノード、または正確に２つないしは３つのノードを持つ一"
+"つのウェイ、を選択してください。"
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
@@ -652,5 +666,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
@@ -665,5 +679,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 "削除"
@@ -785,5 +799,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29
 msgid "Download primitives referring to one of the selected primitives"
-msgstr "選択したプリミティブの一つを参照しているプリミティブをダウンロードします。"
+msgstr ""
+"選択したプリミティブの一つを参照しているプリミティブをダウンロードします。"
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
@@ -912,11 +927,14 @@
 #: ../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 ""
 "The selected ways have nodes outside of the downloaded data region."
-msgstr[0] "選択したウェイにはダウンロードされたデータ領域の外にノードがあります。"
+msgstr[0] ""
+"選択したウェイにはダウンロードされたデータ領域の外にノードがあります。"
 
 #: ../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 "これにより思わぬノードが削除されることがあります。"
@@ -958,5 +976,7 @@
 "Some of the ways were part of relations that have been modified. Please "
 "verify no errors have been introduced."
-msgstr "修正したリレーションにいくつかのウェイが含まれています。エラーが出ないことを確認してください。"
+msgstr ""
+"修正したリレーションにいくつかのウェイが含まれています。エラーが出ないことを"
+"確認してください。"
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303
@@ -1058,5 +1078,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
-msgstr "緯度、経度、ズームを解析することができませんでした。確認をしてください。"
+msgstr ""
+"緯度、経度、ズームを解析することができませんでした。確認をしてください。"
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116
@@ -1097,5 +1118,7 @@
 msgid ""
 "Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
-msgstr "ノードをマージできません：おそらく使用中のウェイ ''{0}'' を削除する必要があります。"
+msgstr ""
+"ノードをマージできません：おそらく使用中のウェイ ''{0}'' を削除する必要があり"
+"ます。"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:269
@@ -1208,10 +1231,13 @@
 msgid_plural ""
 "Cannot open {0} files because no suitable file importer is available."
-msgstr[0] "ファイル{0}は、対応するファイル取り込みフィルターがないため開けません。"
+msgstr[0] ""
+"ファイル{0}は、対応するファイル取り込みフィルターがないため開けません。"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:189
 #, java-format
 msgid "<html>Cannot open directory ''{0}''.<br>Please select a file.</html>"
-msgstr "<html>ディレクトリ ''{0}'' をオープンできません。<br>ファイルを選択してください。</html>"
+msgstr ""
+"<html>ディレクトリ ''{0}'' をオープンできません。<br>ファイルを選択してくださ"
+"い。</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:190
@@ -1275,7 +1301,9 @@
 "shortcut for Orthogonalize / Undo. The default is Shift-Q.)"
 msgstr ""
-"<h3>いくつかのウェイが選択されているときに、９０度ないしは１８０度に形状が調整されました。</h3>セレクションに二つのノードを追加できます。そして、"
-"その２つのノードを基準として、方向を修正できます。（その後、そのノードの移動を取り消しできます）：<br>ノードを選択して、Orthogonalize/U"
-"ndoのショートカットを選択してください。既定はShift-Qです。"
+"<h3>いくつかのウェイが選択されているときに、９０度ないしは１８０度に形状が調"
+"整されました。</h3>セレクションに二つのノードを追加できます。そして、その２つ"
+"のノードを基準として、方向を修正できます。（その後、そのノードの移動を取り消"
+"しできます）：<br>ノードを選択して、Orthogonalize/Undoのショートカットを選択"
+"してください。既定はShift-Qです。"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45
@@ -1319,7 +1347,7 @@
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
 msgstr ""
-"<html>今、EPSG:4326 "
-"投影法を使っています。これは、長方形整列を行うと<br>望ましくない結果を引き起こすかもしれません。<br>この警告を消すには、投影法を変えて見てください"
-"。<br>続けますか?</html>"
+"<html>今、EPSG:4326 投影法を使っています。これは、長方形整列を行うと<br>望ま"
+"しくない結果を引き起こすかもしれません。<br>この警告を消すには、投影法を変え"
+"て見てください。<br>続けますか?</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:148
@@ -1344,5 +1372,7 @@
 "<html>Please make sure all selected ways head in a similar direction<br>or "
 "orthogonalize them one by one.</html>"
-msgstr "<html>すべての選択されたウエイが同じ方向にそろえられるので、<br> 不都合であれば、一つ一つ方向を選んでください。</html>"
+msgstr ""
+"<html>すべての選択されたウエイが同じ方向にそろえられるので、<br> 不都合であれ"
+"ば、一つ一つ方向を選んでください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:417
@@ -1378,5 +1408,6 @@
 "incomplete primitives?"
 msgstr ""
-"コピーしたデータは不完全なプリミティブを含んでいます。貼り付けると不完全なプリミティブが削除されます。データを不完全なプリミティブ抜きで貼り付けますか？"
+"コピーしたデータは不完全なプリミティブを含んでいます。貼り付けると不完全なプ"
+"リミティブが削除されます。データを不完全なプリミティブ抜きで貼り付けますか？"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
@@ -1387,5 +1418,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
 msgid "Apply tags of contents of paste buffer to all selected items."
-msgstr "クリップボードのコンテンツのタグを、すべての選択したアイテムに適用します。"
+msgstr ""
+"クリップボードのコンテンツのタグを、すべての選択したアイテムに適用します。"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109
@@ -1468,6 +1500,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
@@ -1494,4 +1526,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
@@ -1500,6 +1534,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 "エラー"
@@ -1569,5 +1603,7 @@
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
 "if you rejected all. Continue?"
-msgstr "未解決の競合があります。競合箇所は保存されず、あなたがすべて否定した様に扱われます。続けますか？"
+msgstr ""
+"未解決の競合があります。競合箇所は保存されず、あなたがすべて否定した様に扱わ"
+"れます。続けますか？"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
@@ -1603,5 +1639,7 @@
 "Select all undeleted objects in the data layer. This selects incomplete "
 "objects too."
-msgstr "データレイヤーの復元されるオブジェクトをすべて選択してください。不完全なオブジェクトも選択します。"
+msgstr ""
+"データレイヤーの復元されるオブジェクトをすべて選択してください。不完全なオブ"
+"ジェクトも選択します。"
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
@@ -1611,6 +1649,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 "バグに添付できる有用な情報と一緒にステータスレポートを表示する"
 
@@ -1646,8 +1683,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 "ダウンロード済みデータ領域の外側のノードを削除"
@@ -1656,5 +1695,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 "いいえ、異常終了します"
@@ -1662,16 +1702,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 "簡略化には、少なくとも1つのウェイを選択してください。"
@@ -1680,13 +1725,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 ""
@@ -1695,8 +1743,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"
@@ -1705,4 +1755,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)"
@@ -1735,5 +1786,7 @@
 "There is more than one way using the nodes you selected. Please select the "
 "way also."
-msgstr[0] "一つ以上のウェイが、あなたの選択したこのノードを使っています。ウェイも選択してください。"
+msgstr[0] ""
+"一つ以上のウェイが、あなたの選択したこのノードを使っています。ウェイも選択し"
+"てください。"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
@@ -1749,5 +1802,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
 msgid "You must select two or more nodes to split a circular way."
-msgstr "円形につながったウェイの分割には、二つ以上のノードを選択する必要があります。"
+msgstr ""
+"円形につながったウェイの分割には、二つ以上のノードを選択する必要があります。"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
@@ -1755,5 +1809,7 @@
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
 "middle of the way.)"
-msgstr "ウェイは選択したノードで分割できません（ヒント：ウェイの真ん中のノードを選択する）"
+msgstr ""
+"ウェイは選択したノードで分割できません（ヒント：ウェイの真ん中のノードを選択"
+"する）"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
@@ -1762,5 +1818,6 @@
 "should verify this and correct it when necessary.</html>"
 msgstr ""
-"<html>リレーションのメンバーであるロールは、全ての新しいウェイにコピーされました。<br>これらを確認して必要なら訂正してください。</html>"
+"<html>リレーションのメンバーであるロールは、全ての新しいウェイにコピーされま"
+"した。<br>これらを確認して必要なら訂正してください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
@@ -1769,5 +1826,6 @@
 "this and correct it when necessary.</html>"
 msgstr ""
-"<html>リレーションのメンバーは全ての新しいウェイにコピーされました。<br>これらを確認して必要なら訂正してください。</html>"
+"<html>リレーションのメンバーは全ての新しいウェイにコピーされました。<br>これ"
+"らを確認して必要なら訂正してください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
@@ -1828,6 +1886,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 "* 1つ以上のウェイに使われている1つのノードとそのウェイの1つ, または"
 
@@ -1835,10 +1892,12 @@
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
-msgstr "* 1つ以上のウェイに使われている1つ以上のノードを持つ1つのウェイ, または"
+msgstr ""
+"* 1つ以上のウェイに使われている1つ以上のノードを持つ1つのウェイ, または"
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
-msgstr "* 1つのウェイと、1つより多いウェイに使われている1つ以上のそのウェイのノード。"
+msgstr ""
+"* 1つのウェイと、1つより多いウェイに使われている1つ以上のそのウェイのノード。"
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
@@ -1849,6 +1908,8 @@
 "own copy and all nodes will be selected."
 msgstr ""
-"備考：ウェイが選択されていれば、引き離されたノードのあたらしいコピーがつくられます。\n"
-"そして新しいノードが選択状態になります。そうでなければ、全てのウェイの自身の\n"
+"備考：ウェイが選択されていれば、引き離されたノードのあたらしいコピーがつくら"
+"れます。\n"
+"そして新しいノードが選択状態になります。そうでなければ、全てのウェイの自身"
+"の\n"
 "コピーが作られ、全てのノードが選択状態になります。"
 
@@ -1895,9 +1956,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)"
@@ -1914,5 +1975,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
@@ -1972,10 +2033,10 @@
 "''{0}''.<br>You have to resolve them first.</html>"
 msgstr ""
-"<html>アップロードされるデータは、レイヤー\"{0}\"の解決されていない競合を含みます。<br>まずそれを先に解消してください</html>"
+"<html>アップロードされるデータは、レイヤー\"{0}\"の解決されていない競合を含み"
+"ます。<br>まずそれを先に解消してください</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:153
 #: ../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 "アップロードする変更はありません。"
@@ -1993,14 +2054,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 "''{0}'' の親を読み込み中"
 
-#: ../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 "ローカルデータセット内の削除済みの親をチェック中"
@@ -2156,5 +2217,7 @@
 "Click to check whether objects in your local dataset are deleted on the "
 "server"
-msgstr "クリックしてあなたのローカルデータセット中の天気オブジェクトがサーバから削除されているかどうかチェック"
+msgstr ""
+"クリックしてあなたのローカルデータセット中の天気オブジェクトがサーバから削除"
+"されているかどうかチェック"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:154
@@ -2178,5 +2241,6 @@
 "report a conflict."
 msgstr[0] ""
-msgstr[1] ""
+"あなたのローカル環境には、サーバで削除された {0} 個のオブジェクトが含まれてい"
+"ます。これを削除または更新すると、サーバはおそらくコンフリクトと通知します。"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:169
@@ -2186,5 +2250,7 @@
 msgid_plural ""
 "Click <strong>{0}</strong> to check the state of these objects on the server."
-msgstr[0] "<strong>{0}</strong> をクリックしてサーバ上のこのオブジェクトの状態をチェック。"
+msgstr[0] ""
+"<strong>{0}</strong> をクリックしてサーバ上のこのオブジェクトの状態をチェッ"
+"ク。"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
@@ -2252,5 +2318,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
@@ -2264,5 +2330,6 @@
 "when deleting a way. Ctrl: delete referring objects."
 msgstr ""
-"クリックすると削除。SHIFT: ウェイセグメントを削除。Alt: ウェイを消すときにノードは消さない。 Ctrl: 参照するオブジェクトを消す。"
+"クリックすると削除。SHIFT: ウェイセグメントを削除。Alt: ウェイを消すときに"
+"ノードは消さない。 Ctrl: 参照するオブジェクトを消す。"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
@@ -2357,5 +2424,7 @@
 "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
 "its normal."
-msgstr "ウェイセグメントをドラッグして長方形を作成。Ctrl+ドラッグで垂線に沿ってセグメントを移動。"
+msgstr ""
+"ウェイセグメントをドラッグして長方形を作成。Ctrl+ドラッグで垂線に沿ってセグメ"
+"ントを移動。"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:29
@@ -2365,9 +2434,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
 msgid ""
-"Drag play head and release near track to play audio from there; "
-"SHIFT+release to synchronize audio at that point."
-msgstr ""
-"再生の先頭へドラッグするか、音声をトラックの近くで離してください。; "
-"SHIFTキーを押しながらドラッグ状態をリリースするとそのポイントに音声が同期します."
+"Drag play head and release near track to play audio from there; SHIFT"
+"+release to synchronize audio at that point."
+msgstr ""
+"再生の先頭へドラッグするか、音声をトラックの近くで離してください。; SHIFTキー"
+"を押しながらドラッグ状態をリリースするとそのポイントに音声が同期します."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
@@ -2412,5 +2481,6 @@
 "Really move them?"
 msgstr ""
-"{0} 件以上の要素が移動されました。大量の要素を移動するというのは、よくある間違いでしょう。\n"
+"{0} 件以上の要素が移動されました。大量の要素を移動するというのは、よくある間"
+"違いでしょう。\n"
 "本当に移動しますか？"
 
@@ -2422,5 +2492,7 @@
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
-msgstr "移動を止めるには、マウスのボタンを放してください。Ctrlキーで、近くのノードとマージします。"
+msgstr ""
+"移動を止めるには、マウスのボタンを放してください。Ctrlキーで、近くのノードと"
+"マージします。"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
@@ -2433,5 +2505,6 @@
 "Ctrl to rotate selected; or change selection"
 msgstr ""
-"ドラッグでオブジェクトを動かす;Shiftキーで、選択を加える。(Ctrlキーで切り替え);Shft-Ctrlで選択を回転。;選択を変更。"
+"ドラッグでオブジェクトを動かす;Shiftキーで、選択を加える。(Ctrlキーで切り替"
+"え);Shft-Ctrlで選択を回転。;選択を変更。"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
@@ -2449,5 +2522,6 @@
 "move zoom with right button"
 msgstr ""
-"ドラッグによるズーム、Ctrl+\".\" or Ctrl+\",\"; Ctrl+\"↑/←/↓/→\" を押しながら移動; 右ドラッグによるズーム"
+"ドラッグによるズーム、Ctrl+\".\" or Ctrl+\",\"; Ctrl+\"↑/←/↓/→\" を押しながら"
+"移動; 右ドラッグによるズーム"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48
@@ -2497,5 +2571,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."
@@ -2544,9 +2618,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
-msgstr "<b>ベイカー ストリート</b> - 任意のキーや名前に ''ベイカー'' と ''ストリート'' を両方含むもの"
+msgstr ""
+"<b>ベイカー ストリート</b> - 任意のキーや名前に ''ベイカー'' と ''ストリー"
+"ト'' を両方含むもの"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
-msgstr "<b>\"ベイカー ストリート\"</b> - 任意のキーや名前に ''ベイカー ストリート'' を含むもの。"
+msgstr ""
+"<b>\"ベイカー ストリート\"</b> - 任意のキーや名前に ''ベイカー ストリート'' "
+"を含むもの。"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
@@ -2563,6 +2641,6 @@
 "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
 msgstr ""
-"<b>type=*</b> -  ''type'' というキーを持つもの全て。* は任意の文字列を意味します。<b>*=value</b>, "
-"<b>type=</b>, <b>*=*</b>, <b>*=</b>なども可能です。"
+"<b>type=*</b> -  ''type'' というキーを持つもの全て。* は任意の文字列を意味し"
+"ます。<b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>なども可能です。"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
@@ -2585,5 +2663,6 @@
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
-msgstr "<b>type:</b> - オブジェクトの型 (<b>node</b>, <b>way</b>, <b>relation</b>)"
+msgstr ""
+"<b>type:</b> - オブジェクトの型 (<b>node</b>, <b>way</b>, <b>relation</b>)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
@@ -2603,5 +2682,7 @@
 "<b>version:</b>... - object with given version (0 objects without an "
 "assigned version)"
-msgstr "<b>version:</b>... - 指定したバージョンを持つオブジェクト（バージョン番号のないオブジェクトは0）"
+msgstr ""
+"<b>version:</b>... - 指定したバージョンを持つオブジェクト（バージョン番号のな"
+"いオブジェクトは0）"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
@@ -2609,11 +2690,15 @@
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
 "assigned changeset)"
-msgstr "<b>changeset:</b>... - 変更セットIDのオブジェクト（変更セットに含まれていないオブジェクトは0)"
+msgstr ""
+"<b>changeset:</b>... - 変更セットIDのオブジェクト（変更セットに含まれていない"
+"オブジェクトは0)"
 
 #: ../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)"
-msgstr "<b>nodes:</b>... - 指定した数のノードをもつオブジェクト（nodes:数 または nodes:最小-最大で指定）"
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
+"min-max)"
+msgstr ""
+"<b>nodes:</b>... - 指定した数のノードをもつオブジェクト（nodes:数 または "
+"nodes:最小-最大で指定）"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
@@ -2621,9 +2706,11 @@
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
 "max)"
-msgstr "<b>tags:</b>... - 与えられた数値のタグのオブジェクト (tags:件数 または tags:最小値-最大値)"
+msgstr ""
+"<b>tags:</b>... - 与えられた数値のタグのオブジェクト (tags:件数 または tags:"
+"最小値-最大値)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
 msgid "<b>role:</b>... - object with given role in a relation"
-msgstr ""
+msgstr "<b>role:</b>... - リレーション内で指定した役割を持つオブジェクト"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
@@ -2667,5 +2754,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr "文字列に引用符をつける場合は<b>\"</b> を使ってください（キーが<b>:</b>を含む場合など）"
+msgstr ""
+"文字列に引用符をつける場合は<b>\"</b> を使ってください（キーが<b>:</b>を含む"
+"場合など）"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
@@ -2674,6 +2763,6 @@
 "escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
 msgstr ""
-"引用符で囲った文字列に <b>\"</b> か <b>\\</b> を含むときには、<b>\\</b> を加えてエスケープしてください。(<b>\\"
-"\"</b> 及び <b>\\\\</b>）。"
+"引用符で囲った文字列に <b>\"</b> か <b>\\</b> を含むときには、<b>\\</b> を加"
+"えてエスケープしてください。(<b>\\\"</b> 及び <b>\\\\</b>）。"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
@@ -2760,5 +2849,6 @@
 "{2}"
 msgstr ""
-"正規表現 \"{0}\" は、オフセット {1} に区切りエラーがあります。全エラーメッセージは:\n"
+"正規表現 \"{0}\" は、オフセット {1} に区切りエラーがあります。全エラーメッ"
+"セージは:\n"
 "\n"
 "{2}"
@@ -2774,10 +2864,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
-msgstr "タグオペレーターを使っている時は、キーは空ではいけません。例えば、こうしてください: key=value"
+msgstr ""
+"タグオペレーターを使っている時は、キーは空ではいけません。例えば、こうしてく"
+"ださい: key=value"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:462
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
-msgstr "プリミティブの種類が不明です: {0}. 許される値は、\"node\", \"way\" そして \"relation\"です。"
+msgstr ""
+"プリミティブの種類が不明です: {0}. 許される値は、\"node\", \"way\" そして "
+"\"relation\"です。"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
@@ -2820,5 +2914,6 @@
 msgid ""
 "Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
-msgstr "警告: 削除されたオブジェクト {1} のタグ ''{0}'' を自動的に切り捨てています"
+msgstr ""
+"警告: 削除されたオブジェクト {1} のタグ ''{0}'' を自動的に切り捨てています"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67
@@ -2827,5 +2922,7 @@
 "Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
 "length {2}. Values length is {3}."
-msgstr "オブジェクト {1} にあるタグ ''{0}'' の値の長さが最大で許可された長さ {2} を超えています。値の長さは {3} です。"
+msgstr ""
+"オブジェクト {1} にあるタグ ''{0}'' の値の長さが最大で許可された長さ {2} を超"
+"えています。値の長さは {3} です。"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70
@@ -2836,5 +2933,6 @@
 #, java-format
 msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr "ウェイ {1} のうち{0}ノードが、最大許容数を越えました。最大許容数は {2} です。"
+msgstr ""
+"ウェイ {1} のうち{0}ノードが、最大許容数を越えました。最大許容数は {2} です。"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
@@ -2853,6 +2951,7 @@
 "dependency.</html>"
 msgstr ""
-"<html>{0} リレーションが相互に参照しあっており、循環を形成しています。<br>JOSM "
-"はこれをアップロードできません。リレーションを編集して相互依存を解消してください。</html>"
+"<html>{0} リレーションが相互に参照しあっており、循環を形成しています。"
+"<br>JOSM はこれをアップロードできません。リレーションを編集して相互依存を解消"
+"してください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
@@ -2883,10 +2982,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
@@ -2988,6 +3091,6 @@
 "conflict cannot be added.</html>"
 msgstr ""
-"<html>レイヤー ''{0}'' "
-"は、既にプリミティブ<br>''{1}''<br>で、競合しています。この競合は加えることができません。</html>"
+"<html>レイヤー ''{0}'' は、既にプリミティブ<br>''{1}''<br>で、競合していま"
+"す。この競合は加えることができません。</html>"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36
@@ -3001,5 +3104,7 @@
 "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
 "primitive ''{1}''."
-msgstr "警告: レイヤー ''{0}'' は既に存在しません。元の ''{1}'' への競合は取り除けません。"
+msgstr ""
+"警告: レイヤー ''{0}'' は既に存在しません。元の ''{1}'' への競合は取り除けま"
+"せん。"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:67
@@ -3009,10 +3114,11 @@
 
 #: ../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
 msgid ""
 "Cannot undo command ''{0}'' because layer ''{1}'' is not present any more"
-msgstr "コマンド ''{0}'' はレイヤー {1} がすでに表示されていないので取り消せません"
+msgstr ""
+"コマンド ''{0}'' はレイヤー {1} がすでに表示されていないので取り消せません"
 
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:42
@@ -3030,5 +3136,7 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
 msgid "At least one object to delete required, got empty collection"
-msgstr "削除するオブジェクトが少なくともひとつは必要です、空のコレクションを受け取りました"
+msgstr ""
+"削除するオブジェクトが少なくともひとつは必要です、空のコレクションを受け取り"
+"ました"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
@@ -3081,10 +3189,11 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231
 msgid ""
-"You are about to delete nodes outside of the area you have "
-"downloaded.<br>This can cause problems because other objects (that you do "
-"not see) might use them.<br>Do you really want to delete?"
-msgstr ""
-"ダウンロードしたエリア外のノードを削除しようとしています。<br>（あなたが見ていない）ほかのオブジェクトが使っているかもしれないので、この操作は問題を引"
-"き起こします。<br>本当に削除しますか？"
+"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 ""
+"ダウンロードしたエリア外のノードを削除しようとしています。<br>（あなたが見て"
+"いない）ほかのオブジェクトが使っているかもしれないので、この操作は問題を引き"
+"起こします。<br>本当に削除しますか？"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
@@ -3101,5 +3210,6 @@
 "because you don't see the real object.<br>Do you really want to delete?"
 msgstr ""
-"不完全なオブジェクトを削除しようとしています。<br>実際のオブジェクトを見ていないので問題を引き起こす可能性があります。<br>本当に削除しますか？"
+"不完全なオブジェクトを削除しようとしています。<br>実際のオブジェクトを見てい"
+"ないので問題を引き起こす可能性があります。<br>本当に削除しますか？"
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:42
@@ -3129,11 +3239,11 @@
 msgstr[0] "{0} 個のノードを移動"
 
-#: ../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 "オブジェクト ''{0}'' を取り除いた。"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111
 #, java-format
 msgid "Purged {0} object"
@@ -3141,12 +3251,14 @@
 msgstr[0] "{0}オブジェクトの削除"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 #, java-format
 msgid ""
 "Warning: Purging way {0} because number of nodes dropped below 2. Current is "
 "{1}"
-msgstr "警告: ウェイ内のノードの数が2を下回ったので、ウェイ {0}を破棄します。現在は、{1} です。"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:168
+msgstr ""
+"警告: ウェイ内のノードの数が2を下回ったので、ウェイ {0}を破棄します。現在は、"
+"{1} です。"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172
 #, java-format
 msgid "Removing reference from relation {0}"
@@ -3222,5 +3334,7 @@
 "When reversing this way, the following changes to properties of the way and "
 "its nodes are suggested in order to maintain data consistency."
-msgstr "このウェイを反転するならば、データの一貫性を保つため、ウェイとそのノードのプロパティーに対する以下の変更が推奨されます。"
+msgstr ""
+"このウェイを反転するならば、データの一貫性を保つため、ウェイとそのノードのプ"
+"ロパティーに対する以下の変更が推奨されます。"
 
 #: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26
@@ -3304,5 +3418,7 @@
 "Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
 "not a directory."
-msgstr "警告: 設定の初期化に失敗しました。設定ディレクトリ ''{0}'' はディレクトリではありません。"
+msgstr ""
+"警告: 設定の初期化に失敗しました。設定ディレクトリ ''{0}'' はディレクトリでは"
+"ありません。"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
@@ -3311,5 +3427,7 @@
 "<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
 "not a directory.</html>"
-msgstr "<html>設定の初期化に失敗しました。<br>設定ディレクトリ ''{0}'' はディレクトリではありません。</html>"
+msgstr ""
+"<html>設定の初期化に失敗しました。<br>設定ディレクトリ ''{0}'' はディレクトリ"
+"ではありません。</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
@@ -3318,5 +3436,6 @@
 "Warning: Failed to initialize preferences. Failed to create missing "
 "preference directory: {0}"
-msgstr "警告: 設定の初期化に失敗しました。設定ディレクトリ {0} の作成に失敗しました。"
+msgstr ""
+"警告: 設定の初期化に失敗しました。設定ディレクトリ {0} の作成に失敗しました。"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
@@ -3325,5 +3444,7 @@
 "<html>Failed to initialize preferences.<br>Failed to create missing "
 "preference directory: {0}</html>"
-msgstr "<html>設定の初期化に失敗しました。<br>作成に失敗した設定ディレクトリ: {0}</html>"
+msgstr ""
+"<html>設定の初期化に失敗しました。<br>作成に失敗した設定ディレクトリ: {0}</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
@@ -3331,5 +3452,7 @@
 msgid ""
 "Warning: Missing preference file ''{0}''. Creating a default preference file."
-msgstr "警告: 初期設定ファイル ''{0}'' がありません。デフォルトの初期設定ファイルを作成します。"
+msgstr ""
+"警告: 初期設定ファイル ''{0}'' がありません。デフォルトの初期設定ファイルを作"
+"成します。"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
@@ -3338,5 +3461,6 @@
 "Warning: Replacing existing preference file ''{0}'' with default preference "
 "file."
-msgstr "警告: 既存の設定ファイル ''{0}'' をデフォルトの設定ファイルで置き換えます。"
+msgstr ""
+"警告: 既存の設定ファイル ''{0}'' をデフォルトの設定ファイルで置き換えます。"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
@@ -3345,14 +3469,16 @@
 "<html>Failed to initialize preferences.<br>Failed to reset preference file "
 "to default: {0}</html>"
-msgstr "<html>設定の初期化に失敗しました。<br>設定ファイルをデフォルト: {0} にリセットできません</html>"
+msgstr ""
+"<html>設定の初期化に失敗しました。<br>設定ファイルをデフォルト: {0} にリセッ"
+"トできません</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
 #, java-format
 msgid ""
-"<html>Preferences file had errors.<br> Making backup of old one to "
-"<br>{0}<br> and creating a new default preference file.</html>"
-msgstr ""
-"<html>設定ファイルにはエラーがあります。<br>古いもののバックアップを<br>{0}<br>に取って、新しい初期設定ファイルを作ります。</htm"
-"l>"
+"<html>Preferences file had errors.<br> Making backup of old one to <br>{0}"
+"<br> and creating a new default preference file.</html>"
+msgstr ""
+"<html>設定ファイルにはエラーがあります。<br>古いもののバックアップを<br>{0}"
+"<br>に取って、新しい初期設定ファイルを作ります。</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
@@ -3361,5 +3487,7 @@
 "Warning: Failed to initialize preferences.Failed to reset preference file to "
 "default: {0}"
-msgstr "警告: 設定の初期化に失敗しました。設定ファイルのデフォルト: {0} へのリセットに失敗"
+msgstr ""
+"警告: 設定の初期化に失敗しました。設定ファイルのデフォルト: {0} へのリセット"
+"に失敗"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
@@ -3372,5 +3500,6 @@
 msgid ""
 "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr "エラー: ブックマークファイル ''{2}'' 内の行 ''{1}'' に不正なダブル値 ''{0}''"
+msgstr ""
+"エラー: ブックマークファイル ''{2}'' 内の行 ''{1}'' に不正なダブル値 ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
@@ -3398,5 +3527,6 @@
 "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
 "server"
-msgstr "エラー: サーバからのブックマークリストの行 ''{1}'' に不正なダブル値 ''{0}''"
+msgstr ""
+"エラー: サーバからのブックマークリストの行 ''{1}'' に不正なダブル値 ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
@@ -3405,5 +3535,7 @@
 "Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
 "{1}"
-msgstr "''{0}'' からのブックマークのロードはセキュリティ上の理由で失敗しました。例外の内容: {1}"
+msgstr ""
+"''{0}'' からのブックマークのロードはセキュリティ上の理由で失敗しました。例外"
+"の内容: {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:47
@@ -3434,5 +3566,5 @@
 #. *
 #. * the decimal format 999.999
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3441,5 +3573,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3448,5 +3580,5 @@
 #. *
 #. * coordinates East/North
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3490,9 +3622,13 @@
 "error, it should be safe to continue in your work."
 msgstr ""
-"JOSMはデータセット中にプリミティブ [{0} {1}] があることを期待していますが、見つかりませんでした。このことを "
-"http://josm.openstreetmap.de に報告してください。これは深刻なエラーではなく、作業を継続しても安全と思われます。"
+"JOSMはデータセット中にプリミティブ [{0} {1}] があることを期待していますが、見"
+"つかりませんでした。このことを http://josm.openstreetmap.de に報告してくださ"
+"い。これは深刻なエラーではなく、作業を継続しても安全と思われます。"
 
 #: ../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}"
@@ -3504,32 +3640,24 @@
 msgstr "ID {0} のオブジェクトの結合対象が見つかりません"
 
-#: ../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 "ID {0} のノードの結合対象が見つかりません"
 
-#: ../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 "ID {0} のリレーションの結合対象が見つかりません"
 
-#: ../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 "ID {1} のタイプ {0} の結合対象が見つかりません"
-
-#. 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 ""
-"ソースオブジェクトが古いバージョン{2}が不可視であっても、対象となるid "
-"{0}でバージョン{1}のオブジェクトは可視になります。この一貫性の矛盾を扱うことはできません。対象オブジェクトを維持します。 "
 
 #. translators notes must be in front
@@ -3607,36 +3735,41 @@
 msgstr "</p><p>フィルタのダイアログを閉じて全オブジェクトを見る。<p></html>"
 
-#: ../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 "id=0 のプリミティブは非表示にできません"
 
-#: ../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 "ID > 0 である必要があります。 {0} を受け取りました"
 
-#: ../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 "バージョン > 0 である必要があります。 {0} を受け取りました"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:795
 #, java-format
 msgid ""
 "Cannot assign a changesetId > 0 to a new primitive. Value of changesetId is "
 "{0}"
-msgstr "変更セットID > 0 は新しいプリミティブには割り当てられません。変更セットの値は {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1149
+msgstr ""
+"変更セットID > 0 は新しいプリミティブには割り当てられません。変更セットの値"
+"は {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1167
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
 "other is not"
-msgstr "結合できません。なぜなら、処理しようとしているプリミティブが片方は新規で、もう一方は新規ではないためです。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
+msgstr ""
+"結合できません。なぜなら、処理しようとしているプリミティブが片方は新規で、も"
+"う一方は新規ではないためです。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1169
 #, java-format
 msgid ""
 "Cannot merge primitives with different ids. This id is {0}, the other is {1}"
-msgstr "異なるIDのプリミティブはマージできません。こちらのIDは{0}です、相手は {1}です"
+msgstr ""
+"異なるIDのプリミティブはマージできません。こちらのIDは{0}です、相手は {1}です"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
@@ -3675,5 +3808,7 @@
 "Tag collection cannot be applied to a primitive because there are keys with "
 "multiple values."
-msgstr "タグコレクションをプリミティブに適用できません。複数の値を持つキーがあります。"
+msgstr ""
+"タグコレクションをプリミティブに適用できません。複数の値を持つキーがありま"
+"す。"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292
@@ -3685,6 +3820,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 "ID ''{0}'' のプリミティブとID ''{1}'' のプリミティブを比較できません。"
 
@@ -3699,5 +3833,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 "選択済の"
@@ -3705,5 +3839,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
 msgid "Relation: selected"
-msgstr ""
+msgstr "リレーション: 選択済み"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
@@ -3763,5 +3897,6 @@
 "NTF<->RGF93 grid"
 msgstr ""
-"警告: リソース ''/data/{0}''のための入力ストリームの open に失敗しました。NTF<->RGF93 グリッドを読み込めません。"
+"警告: リソース ''/data/{0}''のための入力ストリームの open に失敗しました。"
+"NTF<->RGF93 グリッドを読み込めません。"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:137
@@ -3862,7 +3997,7 @@
 #: ../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>"
-msgstr "<html>''{0}''<br>からブックマークが読み込めません<br>エラー内容: {1}</html>"
+msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+"<html>''{0}''<br>からブックマークが読み込めません<br>エラー内容: {1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
@@ -3931,5 +4066,5 @@
 #. color tiger_data
 #. </rule>
-#. 
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -3939,5 +4074,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -3946,5 +4081,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -3953,5 +4088,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -3960,5 +4095,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -3967,5 +4102,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -3974,9 +4109,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--annotation tags -->
-#. 
+#.
 #. <!--"work in progress" tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="building"/>
@@ -3985,5 +4120,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 "建物"
@@ -4069,5 +4204,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
@@ -4091,5 +4226,6 @@
 #, java-format
 msgid "Expected non-empty value for parameter ''{0}'', got ''{1}''"
-msgstr "パラメータ \"{0}\" は空白を想定していますが、現在 \"{1}\" になっています。"
+msgstr ""
+"パラメータ \"{0}\" は空白を想定していますが、現在 \"{1}\" になっています。"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
@@ -4130,5 +4266,7 @@
 "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
 "filename"
-msgstr "それぞれをダウンロード。x1,y1,x2,y2や、lat=y&lon=x&zoom=z を含むURLか、ファイル名を指定できます。"
+msgstr ""
+"それぞれをダウンロード。x1,y1,x2,y2や、lat=y&lon=x&zoom=z を含むURLか、ファイ"
+"ル名を指定できます。"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
@@ -4137,5 +4275,6 @@
 "lat=y&lon=x&zoom=z or a filename"
 msgstr ""
-"それぞれを生GPSとしてダウンロード。x1,y1,x2,y2を、lat=y&lon=x&zoom=zを含むURLかファイル名で指定できます。"
+"それぞれを生GPSとしてダウンロード。x1,y1,x2,y2を、lat=y&lon=x&zoom=zを含むURL"
+"かファイル名で指定できます。"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
@@ -4143,5 +4282,7 @@
 "Add each to the initial selection. Can be a google-like search string or an "
 "URL which returns osm-xml"
-msgstr "それぞれを初期の選択として追加します。グーグルのような検索文字列やOSM-XMLを返すURLで指定できます。"
+msgstr ""
+"それぞれを初期の選択として追加します。グーグルのような検索文字列やOSM-XMLを返"
+"すURLで指定できます。"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
@@ -4234,5 +4375,6 @@
 "megabytes"
 msgstr ""
-"お知らせ: いくつかの作業で、JOSM は大量のメモリを消費します。JOSM起動時に以下のJavaオプションを使用して\n"
+"お知らせ: いくつかの作業で、JOSM は大量のメモリを消費します。JOSM起動時に以下"
+"のJavaオプションを使用して\n"
 "      使用メモリの最大サイズ（メガバイト単位）を指定することができます。"
 
@@ -4245,5 +4387,6 @@
 "Parameters --download, --downloadgps, and --selection are processed in this "
 "order."
-msgstr "パラメータ --downloadと--downloadgpsと--selectionは、この順序で処理されます。"
+msgstr ""
+"パラメータ --downloadと--downloadgpsと--selectionは、この順序で処理されます。"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
@@ -4290,5 +4433,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
@@ -4297,4 +4440,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
@@ -4403,5 +4547,7 @@
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
 "this list with the mouse.<hr>"
-msgstr "繰り返すには再び真中をクリックしてください。<br> CTRL キーを押しつづけるとマウスでこの表から直接選べます。"
+msgstr ""
+"繰り返すには再び真中をクリックしてください。<br> CTRL キーを押しつづけるとマ"
+"ウスでこの表から直接選べます。"
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
@@ -4450,6 +4596,6 @@
 "relation</strong>.</html>"
 msgstr ""
-"<html><strong>1 オブジェクト</strong> を<strong>1 リレーション</strong> "
-"から削除して良いか確認してください。</html>"
+"<html><strong>1 オブジェクト</strong> を<strong>1 リレーション</strong> から"
+"削除して良いか確認してください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152
@@ -4460,6 +4606,6 @@
 "relations</strong>.</html>"
 msgstr ""
-"<html><strong>1 オブジェクト</strong> を<strong>{0} リレーション</strong> "
-"から削除して良いか確認してください。</html>"
+"<html><strong>1 オブジェクト</strong> を<strong>{0} リレーション</strong> か"
+"ら削除して良いか確認してください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156
@@ -4499,5 +4645,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
@@ -4518,5 +4664,7 @@
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
 "level.</html>"
-msgstr "<html>与えられたズームレベルで<strong>OSMタイルのレンジ</strong>を選択してください。</html>"
+msgstr ""
+"<html>与えられたズームレベルで<strong>OSMタイルのレンジ</strong>を選択してく"
+"ださい。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
@@ -4536,10 +4684,10 @@
 "<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>"
-msgstr ""
-"<html>一つのタイルを指定する場合は、<strong>タイルのアドレス</strong> での指定も可能です。 "
-"<i>ズームレベル/x/y</i>で指定してください。例)<i>15/256/223</i>。<i>zoom,x,y</i> or "
-"<i>zoom;x;y</i>での指定も可能です。</html>"
+"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"html>"
+msgstr ""
+"<html>一つのタイルを指定する場合は、<strong>タイルのアドレス</strong> での指"
+"定も可能です。 <i>ズームレベル/x/y</i>で指定してください。例)<i>15/256/223</"
+"i>。<i>zoom,x,y</i> or <i>zoom;x;y</i>での指定も可能です。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
@@ -4565,9 +4713,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
 msgid "The current value isn''t a valid tile index for the given zoom level"
-msgstr "現在の値は指定されたズームレベルに適切なタイルインデックスではありません"
+msgstr ""
+"現在の値は指定されたズームレベルに適切なタイルインデックスではありません"
 
 #. *
 #. * 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"
@@ -4576,5 +4725,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"
@@ -4583,5 +4732,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"
@@ -4646,5 +4795,7 @@
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr "結合されたノードリストを固定しました。このウェイのノードリストには保留中の競合はありません。"
+msgstr ""
+"結合されたノードリストを固定しました。このウェイのノードリストには保留中の競"
+"合はありません。"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
@@ -4664,5 +4815,7 @@
 "Merged member list frozen. No pending conflicts in the member list of this "
 "relation"
-msgstr "結合されたメンバーリストを固定しました。このリレーションのメンバーリストには保留中の競合はありません。"
+msgstr ""
+"結合されたメンバーリストを固定しました。このリレーションのメンバーリストには"
+"保留中の競合はありません。"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200
@@ -4699,5 +4852,7 @@
 "The following primitives could not be copied to the target "
 "primitive<br>because they are deleted in the target dataset:"
-msgstr "以下のプリミティブは、対象となるプリミティブにコピーできません。<br>これは先方のデータセットが削除されているためです:"
+msgstr ""
+"以下のプリミティブは、対象となるプリミティブにコピーできません。<br>これは先"
+"方のデータセットが削除されているためです:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335
@@ -4748,5 +4903,7 @@
 "List of merged elements. They will replace the my elements when the merge "
 "decisions are applied."
-msgstr "結合した要素のリスト。結合が適用されると、あなたの編集した要素は置き換えられるでしょう。"
+msgstr ""
+"結合した要素のリスト。結合が適用されると、あなたの編集した要素は置き換えられ"
+"るでしょう。"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292
@@ -4779,5 +4936,6 @@
 "Copy my selected elements before the first selected element in the list of "
 "merged elements."
-msgstr "選択した要素を、結合された要素リストから選択している最初の要素の前にコピー"
+msgstr ""
+"選択した要素を、結合された要素リストから選択している最初の要素の前にコピー"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:515
@@ -4785,5 +4943,6 @@
 "Copy my selected elements after the first selected element in the list of "
 "merged elements."
-msgstr "選択した要素を、結合された要素リストから選択している最初の要素の後にコピー"
+msgstr ""
+"選択した要素を、結合された要素リストから選択している最初の要素の後にコピー"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:544
@@ -4793,6 +4952,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 "相手の選択した要素を、結合された要素リストの最後にコピー"
 
@@ -4801,5 +4959,6 @@
 "Copy their selected elements before the first selected element in the list "
 "of merged elements."
-msgstr "相手の選択した要素を、結合された要素リストの最初に選択された要素の前にコピー"
+msgstr ""
+"相手の選択した要素を、結合された要素リストの最初に選択された要素の前にコピー"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:617
@@ -4807,5 +4966,6 @@
 "Copy their selected element after the first selected element in the list of "
 "merged elements"
-msgstr "相手の選択した要素を、結合された要素リストの最初に選択された要素の後にコピー"
+msgstr ""
+"相手の選択した要素を、結合された要素リストの最初に選択された要素の後にコピー"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:643
@@ -4872,14 +5032,18 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their "
-"entries.</html>"
-msgstr "<html><strong>{0}</strong> をクリックして自分と相手のエントリの結合を開始</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
+msgstr ""
+"<html><strong>{0}</strong> をクリックして自分と相手のエントリの結合を開始</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:855
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their "
-"entries.</html>"
-msgstr "<html><strong>{0}</strong> をクリックして自分と相手のエントリの結合を完了</html>"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
+"html>"
+msgstr ""
+"<html><strong>{0}</strong> をクリックして自分と相手のエントリの結合を完了</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:873
@@ -4907,5 +5071,6 @@
 "Adjustable {0} not registered yet. Cannot set participation in synchronized "
 "adjustment."
-msgstr "調整可能な {0} がまだ登録されていません。同期された調整に参加設定できません。"
+msgstr ""
+"調整可能な {0} がまだ登録されていません。同期された調整に参加設定できません。"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:957
@@ -4926,6 +5091,6 @@
 #, java-format
 msgid ""
-"<html>An error occurred while communicating with the server<br>Details: "
-"{0}</html>"
+"<html>An error occurred while communicating with the server<br>Details: {0}</"
+"html>"
 msgstr "<html>サーバとの通信中にエラー発生<br>詳細: {0}</html>"
 
@@ -4953,5 +5118,6 @@
 "server.<br><br>Do you want to undelete these nodes too?"
 msgstr[0] ""
-"{0} 件の付加的なノードをウェイ {1} が使用していますがサーバ上から削除されています。<br><br>このノードも削除を取り消しますか？"
+"{0} 件の付加的なノードをウェイ {1} が使用していますがサーバ上から削除されてい"
+"ます。<br><br>このノードも削除を取り消しますか？"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525
@@ -4968,5 +5134,6 @@
 "deleted on the server.<br><br>Do you want to undelete these too?"
 msgstr[0] ""
-"{0} 件の付加的なプリミティブをリレーション {1} が参照していますがサーバ上から削除されています。<br><br>これも削除を取り消しますか？"
+"{0} 件の付加的なプリミティブをリレーション {1} が参照していますがサーバ上から"
+"削除されています。<br><br>これも削除を取り消しますか？"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559
@@ -4982,5 +5149,7 @@
 "Properties in the merged element. They will replace properties in my "
 "elements when merge decisions are applied."
-msgstr "結合された要素のプロパティ。結合する決定が適用された時、相手は自分の要素のプロパティを置換します。"
+msgstr ""
+"結合された要素のプロパティ。結合する決定が適用された時、相手は自分の要素のプ"
+"ロパティを置換します。"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99
@@ -5078,5 +5247,6 @@
 msgstr ""
 "<html>あなたのローカルバージョンを保持するために、JOSM<br>はプリミティブ {0} "
-"のIDを0にリセットしなければなりません。<br>次回アップロード時にサーバはこれに新しいIDを<br>割り当てます。<br>同意しますか？</html>"
+"のIDを0にリセットしなければなりません。<br>次回アップロード時にサーバはこれに"
+"新しいIDを<br>割り当てます。<br>同意しますか？</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
@@ -5098,6 +5268,6 @@
 "dataset.<br>Do you agree?</html>"
 msgstr ""
-"<html>JOSM はid {0} "
-"のあなたのローカルプリミティブをデータセットから<br>削除しなければなりません。<br>よろしいですか？</html>"
+"<html>JOSM はid {0} のあなたのローカルプリミティブをデータセットから<br>削除"
+"しなければなりません。<br>よろしいですか？</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685
@@ -5146,10 +5316,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"
@@ -5158,10 +5330,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
@@ -5243,4 +5417,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 "なし"
@@ -5375,5 +5550,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
 msgid "Tag modified relations with "
-msgstr ""
+msgstr "Tag modified relations with "
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
@@ -5381,5 +5556,7 @@
 "<html>Select to enable entering a tag which will be applied<br>to all "
 "modified relations.</html>"
-msgstr "<html>選択してタグの入力を有効化。全ての変更されたリレーションに<br>適用されます。</html>"
+msgstr ""
+"<html>選択してタグの入力を有効化。全ての変更されたリレーションに<br>適用され"
+"ます。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
@@ -5390,5 +5567,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr "<html>タグキーを入力してください、例）<strong><tt>fixme</tt></strong></html>"
+msgstr ""
+"<html>タグキーを入力してください、例）<strong><tt>fixme</tt></strong></html>"
 
 #. Strings in GTK ColorChooser
@@ -5402,5 +5580,7 @@
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
-msgstr "<html>タグの値を入力してください、例）<strong><tt>check members</tt></strong></html>"
+msgstr ""
+"<html>タグの値を入力してください、例）<strong><tt>check members</tt></"
+"strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
@@ -5413,7 +5593,9 @@
 "place of the original way in the relation.</html>"
 msgstr ""
-"<html>結合されたウエイは、関連づけのメンバーです。この関連への所属について、<strong>維持する</strong>か、<strong>解除する<"
-"/strong>か決めてください。<br>既定値は、一つ目のウエイについては<strong>維持</strong>し、同じ関連のメンバーになっている残りに"
-"ついては<strong>解除</strong>です。結合されたウエイは、関連中でもともとのウエイの場所で示されます。</html>"
+"<html>結合されたウエイは、関連づけのメンバーです。この関連への所属について、"
+"<strong>維持する</strong>か、<strong>解除する</strong>か決めてください。<br>"
+"既定値は、一つ目のウエイについては<strong>維持</strong>し、同じ関連のメンバー"
+"になっている残りについては<strong>解除</strong>です。結合されたウエイは、関連"
+"中でもともとのウエイの場所で示されます。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
@@ -5457,10 +5639,10 @@
 #: ../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>"
-msgstr ""
-"<html>選択すると現在選択しているオブジェクトの変更セットだけを表示。<br>選択を解除するとデータレイヤ内のオブジェクト全ての変更セットを表示。</"
+"<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 ""
+"<html>選択すると現在選択しているオブジェクトの変更セットだけを表示。<br>選択"
+"を解除するとデータレイヤ内のオブジェクト全ての変更セットを表示。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
@@ -5484,6 +5666,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 "OSMサーバから選択された変更セットについての情報をダウンロード"
 
@@ -5529,5 +5710,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
@@ -5544,4 +5725,5 @@
 "Selects the objects that take part in this command (unless currently deleted)"
 msgstr ""
+"このコマンドに参加するオブジェクト(現在削除されていなければ)を選択します"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:375
@@ -5600,10 +5782,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 ""
 
@@ -5626,5 +5807,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
@@ -5632,5 +5813,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 "追加"
@@ -5679,5 +5860,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 "履歴"
@@ -5897,10 +6078,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 "リレーション一覧のリレーションを選択。"
@@ -5929,5 +6110,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883
 msgid "Inspect"
-msgstr ""
+msgstr "検査"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
@@ -5938,5 +6119,7 @@
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
-msgstr "このパネルを閉じます。左側のツールバーのボタンを使うことで再度開くことができます。"
+msgstr ""
+"このパネルを閉じます。左側のツールバーのボタンを使うことで再度開くことができ"
+"ます。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
@@ -5972,5 +6155,6 @@
 msgid ""
 "Warning: only launching info browsers for the first {0} of {1} selected users"
-msgstr "警告: 選択されたユーザ {1} のうち、最初の {0} だけに情報ブラウザを起動します"
+msgstr ""
+"警告: 選択されたユーザ {1} のうち、最初の {0} だけに情報ブラウザを起動します"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:226
@@ -5979,5 +6163,7 @@
 "<html>Failed to create an URL because the encoding ''{0}''<br>was missing on "
 "this system.</html>"
-msgstr "<html>URLの生成に失敗しました。指定したエンコーディング ''{0}''<br>はこの環境では利用できません。</html>"
+msgstr ""
+"<html>URLの生成に失敗しました。指定したエンコーディング ''{0}''<br>はこの環境"
+"では利用できません。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:228
@@ -6076,6 +6262,6 @@
 "user name<br>in the JOSM preferences.</html>"
 msgstr ""
-"<html>現在 JOSM "
-"は匿名ユーザで起動しています。<br>環境設定でOSMのユーザ名を設定しないとあなたの変更セットをダウンロードすることはできません。</html>"
+"<html>現在 JOSM は匿名ユーザで起動しています。<br>環境設定でOSMのユーザ名を設"
+"定しないとあなたの変更セットをダウンロードすることはできません。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:51
@@ -6194,5 +6380,7 @@
 "<html>None of the selected objects is available in the current<br>edit layer "
 "''{0}''.</html>"
-msgstr[0] "<html>選択したオブジェクトは、現在の編集中のレイヤー\"{0}\"<br>にありません。</html>"
+msgstr[0] ""
+"<html>選択したオブジェクトは、現在の編集中のレイヤー\"{0}\"<br>にありません。"
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:331
@@ -7146,5 +7334,7 @@
 "<html>None of the objects in the content of changeset {0} is available in "
 "the current<br>edit layer ''{1}''.</html>"
-msgstr "<html>変更セット{0}に含まれるオブジェクトは、現在の編集中のレイヤー\"{1}\"<br>にありません。"
+msgstr ""
+"<html>変更セット{0}に含まれるオブジェクトは、現在の編集中のレイヤー\"{1}"
+"\"<br>にありません。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417
@@ -7152,5 +7342,6 @@
 "Zoom to the primitives in the content of this changeset in the current data "
 "layer"
-msgstr "現在のデータレイヤー中のこの変更セットのコンテンツ内のプリミティブにズーム"
+msgstr ""
+"現在のデータレイヤー中のこの変更セットのコンテンツ内のプリミティブにズーム"
 
 #. parent for dialog is Main.parent
@@ -7251,5 +7442,6 @@
 "Cannot restrict changeset query to the current user because the current user "
 "is anonymous"
-msgstr "現在匿名ユーザーで編集しているため、変更セットのクエリを制限できません。"
+msgstr ""
+"現在匿名ユーザーで編集しているため、変更セットのクエリを制限できません。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
@@ -7308,5 +7500,6 @@
 "Cannot build changeset query with time based restrictions. Input is not "
 "valid."
-msgstr "入力に間違いはありませんが、時間に基づいた変更セットクエリは生成できません。"
+msgstr ""
+"入力に間違いはありませんが、時間に基づいた変更セットクエリは生成できません。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
@@ -7314,5 +7507,7 @@
 "<html>Please enter valid date/time values to restrict<br>the query to a "
 "specific time range.</html>"
-msgstr "<html>検索する時間帯を指定する際には、正しい日付・時間を<br>入力してください。</html>"
+msgstr ""
+"<html>検索する時間帯を指定する際には、正しい日付・時間を<br>入力してくださ"
+"い。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
@@ -7324,5 +7519,6 @@
 "Cannot restrict the changeset query to a specific bounding box. The input is "
 "invalid."
-msgstr "特定の指定された範囲での変更セット検索は制限できません。入力が不正です。"
+msgstr ""
+"特定の指定された範囲での変更セット検索は制限できません。入力が不正です。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
@@ -7330,5 +7526,7 @@
 "<html>Please enter valid longitude/latitude values to restrict<br>the "
 "changeset query to a specific bounding box.</html>"
-msgstr "<html>特定の範囲の変更セット検索の際には、<br>正しい緯度・経度を入力してください。</html>"
+msgstr ""
+"<html>特定の範囲の変更セット検索の際には、<br>正しい緯度・経度を入力してくだ"
+"さい。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
@@ -7346,5 +7544,6 @@
 "<html>The  current value is not a valid user name.<br>Please enter an non-"
 "empty user name.</html>"
-msgstr "<html>不正なユーザ名です。<br>ユーザ名は空白以外を指定してください。</html>"
+msgstr ""
+"<html>不正なユーザ名です。<br>ユーザ名は空白以外を指定してください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
@@ -7355,7 +7554,9 @@
 #, 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>"
-msgstr "普段使用する日付の書式で記入してください。br>例: {0}<br>例: {1}<br>例: {2}<br>例: {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 ""
+"普段使用する日付の書式で記入してください。br>例: {0}<br>例: {1}<br>例: {2}"
+"<br>例: {3}<br>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1127
@@ -7365,5 +7566,6 @@
 "{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
 msgstr ""
-"指定されたフォーマットで正しい時刻を入力してください。<br>例： {0} <br>例：{1} <br>例: {2} <br>例: {3} <br>"
+"指定されたフォーマットで正しい時刻を入力してください。<br>例： {0} <br>例："
+"{1} <br>例: {2} <br>例: {3} <br>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:108
@@ -7375,16 +7577,19 @@
 "<html>Select to restrict the query to your changesets only.<br>Unselect to "
 "include all changesets in the query.</html>"
-msgstr "<html>選択してあなたの変更セットにだけクエリを制限。<br>クエリ中の全変更セットを含めるなら選択を解除。</html>"
+msgstr ""
+"<html>選択してあなたの変更セットにだけクエリを制限。<br>クエリ中の全変更セッ"
+"トを含めるなら選択を解除。</html>"
 
 #: ../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>"
-msgstr ""
-"<html>次の<strong>標準クエリ</strong>からひとつ選んでください。自分が作成した変更セットだけをダウンロードしたい場合は<strong"
-">自分の変更セットだけをダウンロード</strong>を選んでください。<br>JOSMは最大100件の変更セットをダウンロードしますので注意してください"
-"。</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 ""
+"<html>次の<strong>標準クエリ</strong>からひとつ選んでください。自分が作成した"
+"変更セットだけをダウンロードしたい場合は<strong>自分の変更セットだけをダウン"
+"ロード</strong>を選んでください。<br>JOSMは最大100件の変更セットをダウンロー"
+"ドしますので注意してください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:147
@@ -7417,5 +7622,7 @@
 "Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
 "default query."
-msgstr "警告: 設定 \"{0}\"に予期しない値\"{1}\"が指定されました。既定のクエリーに戻します。"
+msgstr ""
+"警告: 設定 \"{0}\"に予期しない値\"{1}\"が指定されました。既定のクエリーに戻し"
+"ます。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
@@ -7497,5 +7704,7 @@
 "Note that changeset queries are currently always submitted to ''{0}'', "
 "regardless of the host, port and path of the URL entered below."
-msgstr "変更セットクエリは現状では常に \"{0}\" に投稿されます。以下のURLに含まれるホスト、ポート、パスは無視されます。"
+msgstr ""
+"変更セットクエリは現状では常に \"{0}\" に投稿されます。以下のURLに含まれるホ"
+"スト、ポート、パスは無視されます。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:174
@@ -7503,9 +7712,9 @@
 msgstr "不正な変更セットクエリURLです"
 
-#: ../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."
@@ -7513,23 +7722,23 @@
 msgstr[0] "これにより {0} オブジェクトが変更されます"
 
-#: ../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 "<差異あり>"
 
-#: ../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 "値を変更しますか?"
 
-#: ../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"
@@ -7537,5 +7746,5 @@
 msgstr[0] "{0}このオブジェクトのプロパティーの変更"
 
-#: ../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."
@@ -7543,77 +7752,77 @@
 msgstr[0] "これにより、{0} 個のオブジェクトが変更されます。"
 
-#: ../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 "キーを選択してください"
 
-#: ../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 "値を選択してください"
 
-#: ../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 "プロパティ/メンバー"
 
-#: ../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 "選択したオブジェクトのプロパティ"
 
 #. 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
+msgstr "位置"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:940
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "プロパティ: {0} / メンバー: {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 "プロパティ/メンバー"
 
-#: ../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 "関連の変更"
 
-#: ../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 "本当に関連{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 "すべてのオブジェクトの選択したキーの削除"
 
-#: ../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 "すべてのオブジェクトに新しいキー/値をペアで追加"
 
-#: ../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 "すべてのオブジェクトの選択したキーの値の編集"
 
-#: ../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 "メインの選択肢から条件を選んでください"
@@ -7660,5 +7869,6 @@
 "<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
 "loaded"
-msgstr "<html>子リレーション<br>{0}<br>はサーバ上から削除されました。ロードできません"
+msgstr ""
+"<html>子リレーション<br>{0}<br>はサーバ上から削除されました。ロードできません"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:353
@@ -7684,5 +7894,6 @@
 msgid "Downloading {0} incomplete child of relation ''{1}''"
 msgid_plural "Downloading {0} incomplete children of relation ''{1}''"
-msgstr[0] "リレーション \"{1}\" に含まれる {0} 個のオブジェクトをダウンロード中"
+msgstr[0] ""
+"リレーション \"{1}\" に含まれる {0} 個のオブジェクトをダウンロード中"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:100
@@ -7726,9 +7937,10 @@
 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>"
-msgstr ""
-"<html>このリレーションの少なくともひとつメンバーは、<br>自身のリレーションを参照しています。<br>これは循環参照を引き起こすため、推奨されませ"
-"ん。<br>循環参照をどうしますか？</html>"
+"relation itself.<br>This creates circular dependencies and is discouraged."
+"<br>How do you want to proceed with circular dependencies?</html>"
+msgstr ""
+"<html>このリレーションの少なくともひとつメンバーは、<br>自身のリレーションを"
+"参照しています。<br>これは循環参照を引き起こすため、推奨されません。<br>循環"
+"参照をどうしますか？</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
@@ -7745,9 +7957,10 @@
 msgid ""
 "<html>This relation already has one or more members referring to<br>the "
-"primitive ''{0}''<br><br>Do you really want to add another relation "
-"member?</html>"
-msgstr ""
-"<html>このリレーションには既にひとつ以上の<br>プリミティブ ''{0}'' "
-"<br>を参照しているメンバーがあります。<br>本当に他のリレーションメンバーを追加しますか？</html>"
+"primitive ''{0}''<br><br>Do you really want to add another relation member?</"
+"html>"
+msgstr ""
+"<html>このリレーションには既にひとつ以上の<br>プリミティブ ''{0}'' <br>を参照"
+"しているメンバーがあります。<br>本当に他のリレーションメンバーを追加します"
+"か？</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612
@@ -7762,16 +7975,18 @@
 "''{0}''.</html>"
 msgstr ""
-"<html>リレーション自身に追加しようとしています。<br><br>これは循環参照を引き起こすので薦められません。<br>リレーション ''{0}'' "
-"をスキップします。</html>"
+"<html>リレーション自身に追加しようとしています。<br><br>これは循環参照を引き"
+"起こすので薦められません。<br>リレーション ''{0}'' をスキップします。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
-msgstr "現在のデータセット内で選択された全プリミティブを最初のメンバーの前に追加"
+msgstr ""
+"現在のデータセット内で選択された全プリミティブを最初のメンバーの前に追加"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
-msgstr "現在のデータセット内で選択された全プリミティブを最後のメンバーの後に追加"
+msgstr ""
+"現在のデータセット内で選択された全プリミティブを最後のメンバーの後に追加"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724
@@ -7779,5 +7994,7 @@
 "Add all primitives selected in the current dataset before the first selected "
 "member"
-msgstr "現在のデータセット内で選択された全プリミティブを最初に選択されたメンバーの前に追加"
+msgstr ""
+"現在のデータセット内で選択された全プリミティブを最初に選択されたメンバーの前"
+"に追加"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758
@@ -7785,5 +8002,7 @@
 "Add all primitives selected in the current dataset after the last selected "
 "member"
-msgstr "現在のデータセット内で選択された全プリミティブを最後に選択されたメンバーの後に追加"
+msgstr ""
+"現在のデータセット内で選択された全プリミティブを最後に選択されたメンバーの後"
+"に追加"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790
@@ -7807,5 +8026,6 @@
 "Select relation members which refer to {0} primitives in the current "
 "selection"
-msgstr "現在の選択の中で {0} プリミティブを参照しているリレーションメンバーを選択"
+msgstr ""
+"現在の選択の中で {0} プリミティブを参照しているリレーションメンバーを選択"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861
@@ -7874,5 +8094,6 @@
 "was open. They have been removed from the relation members list."
 msgstr ""
-"リレーションエディタのオープン中にこの新しいリレーションのメンバーがいくつか削除されました。\n"
+"リレーションエディタのオープン中にこの新しいリレーションのメンバーがいくつか"
+"削除されました。\n"
 "それらはリレーションメンバーリストから削除されました。"
 
@@ -7901,16 +8122,15 @@
 "conflict and close the editor?</html>"
 msgstr ""
-"<html>このリレーションは編集画面以外で変更されています。<br>変更を適用して編集を続けることはできません<br><br>競合を作成してエディタを閉"
-"じますか？</html>"
+"<html>このリレーションは編集画面以外で変更されています。<br>変更を適用して編"
+"集を続けることはできません<br><br>競合を作成してエディタを閉じますか？</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
 #, java-format
 msgid ""
-"<html>Layer ''{0}'' already has a conflict for "
-"primitive<br>''{1}''.<br>Please resolve this conflict first, then try "
-"again.</html>"
-msgstr ""
-"<html>レイヤー ''{0}''には既にプリミティブ ''{1}'' "
-"<br>に競合があります。<br>最初にこの競合を解決してからやり直してください。</html>"
+"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
+"<br>Please resolve this conflict first, then try again.</html>"
+msgstr ""
+"<html>レイヤー ''{0}''には既にプリミティブ ''{1}'' <br>に競合があります。<br>"
+"最初にこの競合を解決してからやり直してください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
@@ -8100,5 +8320,7 @@
 "<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
 "maxlat): </html>"
-msgstr "<html><strong>現在のダウンロード範囲</strong>（minlon, minlat, maxlon, maxlat）:"
+msgstr ""
+"<html><strong>現在のダウンロード範囲</strong>（minlon, minlat, maxlon, "
+"maxlat）:"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
@@ -8113,5 +8335,7 @@
 msgid ""
 "Currently, there is no download area selected. Please select an area first."
-msgstr "現在はダウンロードエリアが選択されていません。最初にエリアを選択してください。"
+msgstr ""
+"現在はダウンロードエリアが選択されていません。最初にエリアを選択してくださ"
+"い。"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:201
@@ -8153,5 +8377,7 @@
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
 "area)"
-msgstr "www.openstreetmap.orgのURL（ダウンロードしたい範囲を表示してパームリンクを貼付けてください）"
+msgstr ""
+"www.openstreetmap.orgのURL（ダウンロードしたい範囲を表示してパームリンクを貼"
+"付けてください）"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
@@ -8212,5 +8438,6 @@
 "into the currently active data layer.</html>"
 msgstr ""
-"<html>選択して新しいデータレイヤーにデータをダウンロード。<br>選択解除して現在の有効なデータレイヤーにダウンロード。</html>"
+"<html>選択して新しいデータレイヤーにデータをダウンロード。<br>選択解除して現"
+"在の有効なデータレイヤーにダウンロード。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219
@@ -8241,10 +8468,9 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is "
-"enabled.<br>Please chose to either download OSM data, or GPX data, or "
-"both.</html>"
-msgstr ""
-"<html> <strong>{0}</strong> も <strong>{1}</strong> "
-"も有効にできません。<br>ダウンロードしたOSMデータか、GPXデータか、その両方を閉じてください。</html>"
+"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
+"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
+msgstr ""
+"<html> <strong>{0}</strong> も <strong>{1}</strong> も有効にできません。<br>"
+"ダウンロードしたOSMデータか、GPXデータか、その両方を閉じてください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
@@ -8386,12 +8612,13 @@
 "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>"
-msgstr ""
-"<html><p class=\"warning-header\">ヘルプ項目の解説文がありません。</p><p class=\"warning-"
-"body\">ヘルプ項目 <strong>{0}</strong>の解説文はまだ存在していません。あなたの母国語 "
-"({1})での解説も、英語の解説もないようです。<br><br>不足している情報を追加して、JOSMのヘルプシステムを向上させてください。あなたの母国語("
-"{1})で<a href=\"{2}\">ヘルプ項目を編集する</a> こともできますし、  <a "
-"href=\"{3}\">英語のヘルプ項目を書くこともできます。</a></p></html>"
+"your local language ({1})</a> and the <a href=\"{3}\">help topic in english</"
+"a>.</p></html>"
+msgstr ""
+"<html><p class=\"warning-header\">ヘルプ項目の解説文がありません。</p><p "
+"class=\"warning-body\">ヘルプ項目 <strong>{0}</strong>の解説文はまだ存在して"
+"いません。あなたの母国語 ({1})での解説も、英語の解説もないようです。<br><br>"
+"不足している情報を追加して、JOSMのヘルプシステムを向上させてください。あなた"
+"の母国語({1})で<a href=\"{2}\">ヘルプ項目を編集する</a> こともできますし、  "
+"<a href=\"{3}\">英語のヘルプ項目を書くこともできます。</a></p></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
@@ -8400,10 +8627,10 @@
 "<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 ""
 "<html><p class=\"error-header\">ヘルプ情報参照中にエラー</p><p class=\"error-"
-"body\">ヘルプトピック用コンテンツ<strong>{0}</strong> がロードできません。エラーメッセージ "
-"(未翻訳):<br><tt>{1}</tt></p></html>"
+"body\">ヘルプトピック用コンテンツ<strong>{0}</strong> がロードできません。エ"
+"ラーメッセージ (未翻訳):<br><tt>{1}</tt></p></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355
@@ -8413,6 +8640,6 @@
 "network problem, please check<br>your internet connection</html>"
 msgstr ""
-"<html>url {0}のヘルプページを開けませんでした。<br> "
-"おそらくネットワークの問題と思われるので、<br>インターネット接続を確認してみてください。</html>"
+"<html>url {0}のヘルプページを開けませんでした。<br> おそらくネットワークの問"
+"題と思われるので、<br>インターネット接続を確認してみてください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360
@@ -8436,6 +8663,6 @@
 "possible for help topics<br>on the help server <tt>{1}</tt>.</html>"
 msgstr ""
-"<html>現在のURLの<tt>{0}</tt><br>は外部URLです。編集は、ヘルプサーバ<tt>{1}</tt>のヘルプ項目だけ可能です。</ht"
-"ml>"
+"<html>現在のURLの<tt>{0}</tt><br>は外部URLです。編集は、ヘルプサーバ<tt>{1}</"
+"tt>のヘルプ項目だけ可能です。</html>"
 
 #. putValue(NAME, tr("Reload"));
@@ -8505,5 +8732,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:272
 msgid "History not initialized yet. Failed to set reference primitive."
-msgstr "履歴はまだ初期化されていません。参照プリミティブのセットに失敗しました。"
+msgstr ""
+"履歴はまだ初期化されていません。参照プリミティブのセットに失敗しました。"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:274
@@ -8529,5 +8757,7 @@
 "Failed to set current primitive. Current version {0} not available in "
 "history."
-msgstr "現在のプリミティブの設定に失敗しました。現在のバージョン {0} は履歴で使用できません。"
+msgstr ""
+"現在のプリミティブの設定に失敗しました。現在のバージョン {0} は履歴で使用でき"
+"ません。"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:55
@@ -8592,5 +8822,6 @@
 msgid ""
 "<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
-msgstr "<html>レイヤー ''{1}'' で編集しているバージョン <strong>{0}</strong></html>"
+msgstr ""
+"<html>レイヤー ''{1}'' で編集しているバージョン <strong>{0}</strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:98
@@ -8598,5 +8829,6 @@
 msgid ""
 "<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
-msgstr "<html>バージョン <strong>{0}</strong> 作成日 <strong>{1}</strong></html>"
+msgstr ""
+"<html>バージョン <strong>{0}</strong> 作成日 <strong>{1}</strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119
@@ -8645,5 +8877,7 @@
 msgid ""
 "Failed to update primitive with id {0} because current edit layer is null"
-msgstr "編集レイヤーに何も含まれていないため、ID {0} のプリミティブ更新に失敗しました。"
+msgstr ""
+"編集レイヤーに何も含まれていないため、ID {0} のプリミティブ更新に失敗しまし"
+"た。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65
@@ -8652,5 +8886,7 @@
 "Failed to update primitive with id {0} because current edit layer does not "
 "include such a primitive"
-msgstr "ID {0} のプリミティブ更新に失敗。現在の編集レイヤにはそのようなプリミティブは含まれていません"
+msgstr ""
+"ID {0} のプリミティブ更新に失敗。現在の編集レイヤにはそのようなプリミティブは"
+"含まれていません"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94
@@ -8680,16 +8916,17 @@
 "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>"
-msgstr ""
-"<html>アップロード<strong>失敗</strong>: "
-"サーバーはあなたのノード・ウェイ・リレーションのどれかに、<br>もっと新しいバージョンのものを持っているようです。<br>この競合は、id "
-"<strong>{1}</strong> の <strong>{0}</strong> でおきました。<br>サーバーにあるバージョンは {2} "
-"で、あなたのは {3} です。<br><br>競合したプリミティブのみを同期させるには、<strong>{4}</strong>をクリックしてください。 "
-"<br>全ローカルセットを同期させるには、<strong>{5}</strong> "
-"をクリックしてください。<br>中止して編集を継続するには、<strong>{6}</strong> をクリックしてください。<br></html>"
+"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
+"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
+"strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{6}</strong> to abort and continue editing.<br></html>"
+msgstr ""
+"<html>アップロード<strong>失敗</strong>: サーバーはあなたのノード・ウェイ・リ"
+"レーションのどれかに、<br>もっと新しいバージョンのものを持っているようです。"
+"<br>この競合は、id <strong>{1}</strong> の <strong>{0}</strong> でおきまし"
+"た。<br>サーバーにあるバージョンは {2} で、あなたのは {3} です。<br><br>競合"
+"したプリミティブのみを同期させるには、<strong>{4}</strong>をクリックしてくだ"
+"さい。 <br>全ローカルセットを同期させるには、<strong>{5}</strong> をクリック"
+"してください。<br>中止して編集を継続するには、<strong>{6}</strong> をクリック"
+"してください。<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
@@ -8703,13 +8940,13 @@
 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>"
-msgstr ""
-"<html>アップロード<strong>失敗</strong>: "
-"サーバーはあなたのノード・ウェイ・リレーションのどれかに、<br>もっと新しいバージョンのものを持っているようです。<br>全ローカルセットを同期させるに"
-"は、<strong>{0}</strong> をクリックしてください。<br>中止して編集を継続するには、<strong>{1}</strong> "
-"をクリックしてください。<br></html>"
+"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
+"</strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{1}</strong> to abort and continue editing.<br></html>"
+msgstr ""
+"<html>アップロード<strong>失敗</strong>: サーバーはあなたのノード・ウェイ・リ"
+"レーションのどれかに、<br>もっと新しいバージョンのものを持っているようです。"
+"<br>全ローカルセットを同期させるには、<strong>{0}</strong> をクリックしてくだ"
+"さい。<br>中止して編集を継続するには、<strong>{1}</strong> をクリックしてくだ"
+"さい。<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194
@@ -8720,6 +8957,7 @@
 "again with a new or an existing open changeset.</html>"
 msgstr ""
-"<html>アップロード <strong>失敗</strong>: あなたが<br>チェンジセット {0} を使用しています。それはすでに {1} "
-"に閉じられましたので、<br>もう一度新規または既に開いている変更セットをアップロードしてください。</html>"
+"<html>アップロード <strong>失敗</strong>: あなたが<br>チェンジセット {0} を使"
+"用しています。それはすでに {1} に閉じられましたので、<br>もう一度新規または既"
+"に開いている変更セットをアップロードしてください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202
@@ -8748,7 +8986,8 @@
 "conflicts which you can resolve in the Conflict Resolution Dialog.</html>"
 msgstr ""
-"<html>アップロード <strong>失敗</strong> ウェイ {1} が使用中のノード {0} "
-"を削除しようとしました。<br><br><strong>{2}</strong> をクリックしてノード {0} "
-"の全ての親ウェイをダウンロードしてください。<br>必要ならJOSM は競合解決ダイアログで解決できる競合として作成します。</html>"
+"<html>アップロード <strong>失敗</strong> ウェイ {1} が使用中のノード {0} を削"
+"除しようとしました。<br><br><strong>{2}</strong> をクリックしてノード {0} の"
+"全ての親ウェイをダウンロードしてください。<br>必要ならJOSM は競合解決ダイアロ"
+"グで解決できる競合として作成します。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237
@@ -8791,5 +9030,7 @@
 "Please decide what changeset the data is uploaded to and whether to close "
 "the changeset after the next upload."
-msgstr "データアップロード先の変更セット、及び次回アップロード後に変更セットを閉じるかどうかを決めてください。"
+msgstr ""
+"データアップロード先の変更セット、及び次回アップロード後に変更セットを閉じる"
+"かどうかを決めてください。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:89
@@ -8863,5 +9104,7 @@
 "Warning: failed to put Credential Dialog always on top. Caught security "
 "exception."
-msgstr "警告: 信用証明ダイアログを常時トップに配置するのに失敗。セキュリティ例外を捕捉しました。"
+msgstr ""
+"警告: 信用証明ダイアログを常時トップに配置するのに失敗。セキュリティ例外を捕"
+"捉しました。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105
@@ -8890,5 +9133,6 @@
 "Authenticating at the OSM API ''{0}'' failed. Please enter a valid username "
 "and a valid password."
-msgstr "OSM API ''{0}'' で認証に失敗。正しいユーザ名とパスワードを入力してください。"
+msgstr ""
+"OSM API ''{0}'' で認証に失敗。正しいユーザ名とパスワードを入力してください。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242
@@ -8909,5 +9153,7 @@
 "Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid "
 "username and a valid password."
-msgstr "HTTP プロキシ''{0}'' で認証に失敗しました。正しいユーザ名とパスワードを入力してください。"
+msgstr ""
+"HTTP プロキシ''{0}'' で認証に失敗しました。正しいユーザ名とパスワードを入力し"
+"てください。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259
@@ -8915,5 +9161,7 @@
 "Warning: depending on the authentication method the proxy server uses the "
 "password may be transferred unencrypted."
-msgstr "警告: プロキシサーバでの暗号化していないパスワードを用いた認証に失敗しました。"
+msgstr ""
+"警告: プロキシサーバでの暗号化していないパスワードを用いた認証に失敗しまし"
+"た。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279
@@ -8936,4 +9184,6 @@
 "working."
 msgstr ""
+"JOSMがあなたを認証できていないため、公開変更セットを表示する事ができません。"
+"<br>あなたは匿名で編集を行っているか、ログインしていません。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:68
@@ -8959,5 +9209,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 "いいえ"
@@ -8965,7 +9215,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
 #, java-format
-msgid ""
-"Layer ''{0}'' has modifications which should be uploaded to the server."
-msgstr "レイヤー ''{0}'' は修正されていますのでサーバにアップロードしてください。"
+msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
+msgstr ""
+"レイヤー ''{0}'' は修正されていますのでサーバにアップロードしてください。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:49
@@ -8979,5 +9229,6 @@
 "Layer ''{0}'' has modifications which should be saved to its associated file "
 "''{1}''."
-msgstr "レイヤー ''{0}'' にはその関連ファイル ''{1}'' に保存すべき修正があります。"
+msgstr ""
+"レイヤー ''{0}'' にはその関連ファイル ''{1}'' に保存すべき修正があります。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:62
@@ -9002,5 +9253,6 @@
 #, java-format
 msgid "File ''{0}'' is not writable. Please enter another file name."
-msgstr "ファイル ''{0}'' には書き込めません。他のファイル名を入力してください。"
+msgstr ""
+"ファイル ''{0}'' には書き込めません。他のファイル名を入力してください。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:109
@@ -9036,5 +9288,6 @@
 "discard the modifications.<br>Layers with conflicts:</html>"
 msgstr[0] ""
-"<html>{0} レイヤーに未解決の競合があります。<br>最初に解決するか修正を破棄してください。<br>競合のあるレイヤー:</html>"
+"<html>{0} レイヤーに未解決の競合があります。<br>最初に解決するか修正を破棄し"
+"てください。<br>競合のあるレイヤー:</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
@@ -9049,10 +9302,10 @@
 msgid_plural ""
 "<html>{0} layers need saving but have no associated file.<br>Either select a "
-"file for each of them or discard the changes.<br>Layers without a "
-"file:</html>"
+"file for each of them or discard the changes.<br>Layers without a file:</"
+"html>"
 msgstr[0] ""
-"<html>{0} "
-"レイヤーは保存が必要ですが関連するファイルがありません。<br>このレイヤー用のファイルを選択するか変更を破棄してください。<br>ファイルの無いレイヤー"
-":</html>"
+"<html>{0} レイヤーは保存が必要ですが関連するファイルがありません。<br>このレ"
+"イヤー用のファイルを選択するか変更を破棄してください。<br>ファイルの無いレイ"
+"ヤー:</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
@@ -9064,6 +9317,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 "
@@ -9126,5 +9379,7 @@
 "<html>Upload and/or save operations of {0} layers with modifications<br>were "
 "cancelled or have failed.</html>"
-msgstr[0] "<html>変更のあるレイヤーのアップロード または保存は、 <br>キャンセルされたか失敗しました。</html>"
+msgstr[0] ""
+"<html>変更のあるレイヤーのアップロード または保存は、 <br>キャンセルされたか"
+"失敗しました。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500
@@ -9288,5 +9543,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9294,5 +9549,7 @@
 "Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
 "primitive and retrying to upload."
-msgstr "警告: プリミティブの ''{0}''  は既にサーバから削除されています。このプリミティブをスキップし、アップロードを再試行します。"
+msgstr ""
+"警告: プリミティブの ''{0}''  は既にサーバから削除されています。このプリミ"
+"ティブをスキップし、アップロードを再試行します。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108
@@ -9302,5 +9559,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44
 msgid "Objects are uploaded to a <strong>new changeset</strong>."
-msgstr "オブジェクトは<strong>新しい変更セット</strong>にアップロードされました。"
+msgstr ""
+"オブジェクトは<strong>新しい変更セット</strong>にアップロードされました。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48
@@ -9310,9 +9568,9 @@
 "comment ''{1}''."
 msgstr ""
-"オブジェクトはアップロードコメント''{1}'' 付きで<strong>オープン済み変更セット</strong> {0} にアップロードされました。"
+"オブジェクトはアップロードコメント''{1}'' 付きで<strong>オープン済み変更セッ"
+"ト</strong> {0} にアップロードされました。"
 
 #: ../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 "変更セットはこのアップロード後に<strong>クローズ</strong>されます"
 
@@ -9331,5 +9589,6 @@
 "Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong>"
 msgstr[0] ""
-"<strong>{0} 個のオブジェクトを </strong> <strong>1 個の変更セットとしてアップロードしています</strong>"
+"<strong>{0} 個のオブジェクトを </strong> <strong>1 個の変更セットとしてアップ"
+"ロードしています</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:87
@@ -9342,6 +9601,6 @@
 "<strong>1 request</strong>"
 msgstr[0] ""
-"<strong>{0} 個のオブジェクトを </strong> <strong>1 個の変更セットとして <strong>1 "
-"リクエスト</strong>でアップロードしています</strong>"
+"<strong>{0} 個のオブジェクトを </strong> <strong>1 個の変更セットとして "
+"<strong>1 リクエスト</strong>でアップロードしています</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:92
@@ -9351,6 +9610,6 @@
 "<strong>{1} requests</strong>"
 msgstr ""
-"<strong>{0} オブジェクト</strong> を<strong>1 変更セット</strong> へ<strong>{1} "
-"リクエスト</strong>を使用してアップロードしています"
+"<strong>{0} オブジェクト</strong> を<strong>1 変更セット</strong> へ<strong>"
+"{1} リクエスト</strong>を使用してアップロードしています"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:94
@@ -9370,9 +9629,9 @@
 #, java-format
 msgid ""
-"Uploading <strong>{0} objects</strong> to <strong>multiple "
-"changesets</strong> using <strong>{1} requests</strong>"
-msgstr ""
-"<strong>{0} 個のオブジェクト</strong> を <strong>複数の変更セット</strong>で<strong>{1} "
-"回要求</strong>してアップロードしようとしています。"
+"Uploading <strong>{0} objects</strong> to <strong>multiple changesets</"
+"strong> using <strong>{1} requests</strong>"
+msgstr ""
+"<strong>{0} 個のオブジェクト</strong> を <strong>複数の変更セット</strong>で"
+"<strong>{1} 回要求</strong>してアップロードしようとしています。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:67
@@ -9413,6 +9672,7 @@
 "on the server ''{1}''."
 msgstr ""
-"サーバから現在の変更セットが閉じられたという通知がありました。<br>おそらく変更セットのサイズがサーバ {1} 上の {0} "
-"オブジェクトの最大サイズを超えています。"
+"サーバから現在の変更セットが閉じられたという通知がありました。<br>おそらく変"
+"更セットのサイズがサーバ {1} 上の {0} オブジェクトの最大サイズを超えていま"
+"す。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:107
@@ -9426,11 +9686,12 @@
 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>"
-msgstr ""
-"''<strong>{0}</strong>'' をクリックして追加の新しい変更セットにアップロードを継続。<br> "
-"''<strong>{1}</strong>'' をクリックしてアップロードダイアログに戻る。<br>''<strong>{2}</strong>'' "
-"をクリックしてアップロードを中断し、マップ編集に戻る。<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 ""
+"''<strong>{0}</strong>'' をクリックして追加の新しい変更セットにアップロードを"
+"継続。<br> ''<strong>{1}</strong>'' をクリックしてアップロードダイアログに戻"
+"る。<br>''<strong>{2}</strong>'' をクリックしてアップロードを中断し、マップ編"
+"集に戻る。<br>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:124
@@ -9439,5 +9700,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9445,13 +9706,17 @@
 "Warning: object ''{0}'' is already deleted on the server. Skipping this "
 "object and retrying to upload."
-msgstr "警告 : オブジェクト ''{0}'' はサーバから既に削除されています。このオブジェクトをスキップしてもう一度アップロードします。"
+msgstr ""
+"警告 : オブジェクト ''{0}'' はサーバから既に削除されています。このオブジェク"
+"トをスキップしてもう一度アップロードします。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195
 #, java-format
 msgid "Object ''{0}'' is already deleted. Skipping object in upload."
-msgstr "オブジェクト ''{0}'' は既に削除されています。アップロード中のオブジェクトをスキップします。"
+msgstr ""
+"オブジェクト ''{0}'' は既に削除されています。アップロード中のオブジェクトをス"
+"キップします。"
 
 #: ../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..."
@@ -9461,6 +9726,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 "アップロードがキャンセルされたため捕捉した例外を無視します。例外: {0}"
 
@@ -9469,5 +9733,7 @@
 "<html>Mark modified objects <strong>from the current selection</strong> to "
 "be uploaded to the server.</html>"
-msgstr "<html><strong>現在の選択から</strong>修正されたオブジェクトをマークしてサーバにアップロード。</html>"
+msgstr ""
+"<html><strong>現在の選択から</strong>修正されたオブジェクトをマークしてサーバ"
+"にアップロード。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:70
@@ -9475,5 +9741,7 @@
 "<html>Mark <strong>locally deleted objects</strong> to be deleted on the "
 "server.</html>"
-msgstr "<html><strong>ローカルで削除されたオブジェクト</strong>をマークしてサーバから削除。</html>"
+msgstr ""
+"<html><strong>ローカルで削除されたオブジェクト</strong>をマークしてサーバから"
+"削除。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:112
@@ -9501,5 +9769,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131
 msgid "Upload data in chunks of objects. Chunk size: "
-msgstr "オブジェクトをいくつかの塊にして、データをアップロードします。チャンクサイズ： "
+msgstr ""
+"オブジェクトをいくつかの塊にして、データをアップロードします。チャンクサイ"
+"ズ： "
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158
@@ -9513,6 +9783,6 @@
 "upload {0} objects. Which strategy do you want to use?</html>"
 msgstr ""
-"<html> "
-"{0}このオブジェクトをアップロードするには、<strong>複数の変更セット</strong>が必要です。どんな方法をとりますか？</html>"
+"<html> {0}このオブジェクトをアップロードするには、<strong>複数の変更セット</"
+"strong>が必要です。どんな方法をとりますか？</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191
@@ -9526,5 +9796,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323
 msgid "Upload in one request not possible (too many objects to upload)"
-msgstr "一回の要求でアップロードすることはできません（アップロードするオブジェクトが多すぎる）"
+msgstr ""
+"一回の要求でアップロードすることはできません（アップロードするオブジェクトが"
+"多すぎる）"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324
@@ -9534,6 +9806,6 @@
 "size {1} on server ''{2}'' is exceeded.</html>"
 msgstr ""
-"<html> {0} 個のオブジェクトが1つの要求でアップロードできません。<br> これは、サーバ \"{2}\" の最大変更セットサイズである "
-"{1} を超えているためです。</html>"
+"<html> {0} 個のオブジェクトが1つの要求でアップロードできません。<br> これは、"
+"サーバ \"{2}\" の最大変更セットサイズである {1} を超えているためです。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
@@ -9543,6 +9815,6 @@
 "upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
-"<html> "
-"{0}このオブジェクトをアップロードするには、<strong>複数の変更セット</strong>が必要です。どんな方法をとりますか？</html>"
+"<html> {0}このオブジェクトをアップロードするには、<strong>複数の変更セット</"
+"strong>が必要です。どんな方法をとりますか？</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351
@@ -9572,5 +9844,6 @@
 #, java-format
 msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''"
-msgstr "チャンクサイズ {0}が、サーバ \"{2}\"の最大変更セットサイズ {1}を超えました。"
+msgstr ""
+"チャンクサイズ {0}が、サーバ \"{2}\"の最大変更セットサイズ {1}を超えました。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415
@@ -9680,10 +9953,10 @@
 #, 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>"
-msgstr ""
-"<html>選択したGPXレイヤー ''{0}'' "
-"はサーバからダウンロードしたものです。<br>タイムスタンプの情報が無いため、音声データとの同期はできません。</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 ""
+"<html>選択したGPXレイヤー ''{0}'' はサーバからダウンロードしたものです。<br>"
+"タイムスタンプの情報が無いため、音声データとの同期はできません。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
@@ -9708,10 +9981,10 @@
 #, 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>"
-msgstr ""
-"<html>選択したGPXレイヤー ''{0}'' "
-"はサーバからダウンロードしたものです。<br>タイムスタンプの情報が無いため、写真との同期はできません。</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 ""
+"<html>選択したGPXレイヤー ''{0}'' はサーバからダウンロードしたものです。<br>"
+"タイムスタンプの情報が無いため、写真との同期はできません。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
@@ -9771,9 +10044,10 @@
 #: ../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:"
-msgstr ""
-"<html>マップデータとして加工されていないGPSデータをアップロードすることは、有害だと考えられています。<br>もしトレースをアップロードしたいなら"
-"ば、ここを見てください："
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>マップデータとして加工されていないGPSデータをアップロードすることは、有"
+"害だと考えられています。<br>もしトレースをアップロードしたいならば、ここを見"
+"てください："
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
@@ -9817,5 +10091,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898
 msgid "Download near:"
-msgstr ""
+msgstr "近隣をダウンロード:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
@@ -9836,5 +10110,7 @@
 "<html>This action will require {0} individual<br>download requests. Do you "
 "wish<br>to continue?</html>"
-msgstr "<html>この操作には、{0}この独立したダウンロード要求を<br>必要とします。続けますか？</html>"
+msgstr ""
+"<html>この操作には、{0}この独立したダウンロード要求を<br>必要とします。続けま"
+"すか？</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
@@ -9846,5 +10122,7 @@
 "Some waypoints with timestamps from before the start of the track or after "
 "the end were omitted or moved to the start."
-msgstr "トラックの開始以前又は終了以後のタイムスタンプがあるウェイポイントは、開始点に変更又は移動されました。"
+msgstr ""
+"トラックの開始以前又は終了以後のタイムスタンプがあるウェイポイントは、開始点"
+"に変更又は移動されました。"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
@@ -9852,5 +10130,7 @@
 "Some waypoints which were too far from the track to sensibly estimate their "
 "time were omitted."
-msgstr "ウェイポイントの一部にトラックから遠すぎて、時間を推測出来ないものがあり、除外します。"
+msgstr ""
+"ウェイポイントの一部にトラックから遠すぎて、時間を推測出来ないものがあり、除"
+"外します。"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118
@@ -9898,5 +10178,7 @@
 "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
 "Dialog and manually resolve them."
-msgstr[0] "{0} 件の競合が未解決です。<br><br>競合リストダイアログをオープンして手動で解決してください。"
+msgstr[0] ""
+"{0} 件の競合が未解決です。<br><br>競合リストダイアログをオープンして手動で解"
+"決してください。"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
@@ -9945,9 +10227,10 @@
 #: ../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>"
-msgstr ""
-"<html>処理していない GPS "
-"データを地図データとしてアップロードすることは有害だと考えられる。<br>もし、トレースデータをアップロードしたいなら、コチラを見よ :</html>"
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:</html>"
+msgstr ""
+"<html>処理していない GPS データを地図データとしてアップロードすることは有害だ"
+"と考えられる。<br>もし、トレースデータをアップロードしたいなら、コチラを見"
+"よ :</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
@@ -10001,10 +10284,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
 msgid ""
-"<html>Take a photo of your GPS receiver while it displays the "
-"time.<br>Display that photo here.<br>And then, simply capture the time you "
-"read on the photo and select a timezone<hr></html>"
-msgstr ""
-"<html> 使用しているGPSレシーバーの、時刻を表示しているところの写真をとります。<br>その写真をここに表示してください。<br> "
-"そして写真に表示されている時刻を読み取って、タイムゾーンを選択します。<hr></html>"
+"<html>Take a photo of your GPS receiver while it displays the time."
+"<br>Display that photo here.<br>And then, simply capture the time you read "
+"on the photo and select a timezone<hr></html>"
+msgstr ""
+"<html> 使用しているGPSレシーバーの、時刻を表示しているところの写真をとりま"
+"す。<br>その写真をここに表示してください。<br> そして写真に表示されている時刻"
+"を読み取って、タイムゾーンを選択します。<hr></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
@@ -10138,5 +10422,6 @@
 msgid_plural ""
 "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track.</html>"
-msgstr[0] "<html>写真は<b>{1}</b> 件中<b>{0}</b> 件がGPSトラックに一致しました。</html>"
+msgstr[0] ""
+"<html>写真は<b>{1}</b> 件中<b>{0}</b> 件がGPSトラックに一致しました。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
@@ -10165,5 +10450,7 @@
 "An error occurred while trying to match the photos to the GPX track. You can "
 "adjust the sliders to manually match the photos."
-msgstr "GPX トラックと写真の照合中にエラーが発生。スライダーを調整して写真と手動で照合できます。"
+msgstr ""
+"GPX トラックと写真の照合中にエラーが発生。スライダーを調整して写真と手動で照"
+"合できます。"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
@@ -10187,5 +10474,7 @@
 "The selected GPX track does not contain timestamps. Please select another "
 "one."
-msgstr "選択されたGPXトラックはタイムスタンプを含んでいません。他のGPXトラックを選択してください。"
+msgstr ""
+"選択されたGPXトラックはタイムスタンプを含んでいません。他のGPXトラックを選択"
+"してください。"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
@@ -10292,5 +10581,7 @@
 "<html><h3>Delete the file {0} from disk?<p>The image file will be "
 "permanently lost!</h3></html>"
-msgstr "<html><h3> ファイル {0} をディスクから削除しますか？<p>イメージファイルは永久に失われます。</h3></html>"
+msgstr ""
+"<html><h3> ファイル {0} をディスクから削除しますか？<p>イメージファイルは永久"
+"に失われます。</h3></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
@@ -10416,5 +10707,7 @@
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
-msgstr "あなたの同期用キューと同期させる瞬間に、オーディオを一時停止する必要があります。"
+msgstr ""
+"あなたの同期用キューと同期させる瞬間に、オーディオを一時停止する必要がありま"
+"す。"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
@@ -10455,5 +10748,7 @@
 "You need to drag the play head near to the GPX track whose associated sound "
 "track you were playing (after the first marker)."
-msgstr "再生ヘッドを、再生しているサウンドトラックに対応するGPXトラックの近くにドラッグする必要があります。"
+msgstr ""
+"再生ヘッドを、再生しているサウンドトラックに対応するGPXトラックの近くにドラッ"
+"グする必要があります。"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:225
@@ -10461,5 +10756,7 @@
 "You need to SHIFT-drag the play head onto an audio marker or onto the track "
 "point where you want to synchronize."
-msgstr "SHIFT+ドラッグで、再生開始点を合わせたいオーディオマーカの上か、トラックポイントの上に持ってくる必要があります。"
+msgstr ""
+"SHIFT+ドラッグで、再生開始点を合わせたいオーディオマーカの上か、トラックポイ"
+"ントの上に持ってくる必要があります。"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
@@ -10497,5 +10794,6 @@
 msgid ""
 "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr "警告: \"\"{0}\"からのMappaintスタイルの解釈に失敗しました。発生した例外は{1}:"
+msgstr ""
+"警告: \"\"{0}\"からのMappaintスタイルの解釈に失敗しました。発生した例外は{1}:"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
@@ -10520,5 +10818,6 @@
 "to use the Access Token in this JOSM session only.</html>"
 msgstr ""
-"<html>選択してJOSMプリファレンスのアクセストークンを保存。<br>選択解除してこのJOSMセッションのアクセストークンだけを使用。</html>"
+"<html>選択してJOSMプリファレンスのアクセストークンを保存。<br>選択解除してこ"
+"のJOSMセッションのアクセストークンだけを使用。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
@@ -10559,5 +10858,7 @@
 "<html>JOSM is about to reset the OAuth settings to default values.<br>The "
 "current custom settings are not saved.</html>"
-msgstr "<html>OAuth認証の設定が初期値に戻ります。<br>現在の設定値は保存されません。</html>"
+msgstr ""
+"<html>OAuth認証の設定が初期値に戻ります。<br>現在の設定値は保存されません。</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
@@ -10581,6 +10882,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 ""
 
@@ -10598,15 +10899,19 @@
 "<html>Enter an Access Token manually if it was generated and retrieved "
 "outside<br>of JOSM.</html>"
-msgstr "<html>JOSM外部で作成・参照されたアクセストークンは手動で入力してください。</html>"
+msgstr ""
+"<html>JOSM外部で作成・参照されたアクセストークンは手動で入力してください。</"
+"html>"
 
 #: ../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."
-msgstr ""
-"あなたのOSMユーザ名とパスワードを入力してください。パスワードはJOSMのプリファレンスに平文で保存され<strong>ません</strong>。OSM"
-"サーバへは<strong>一回だけ</strong>送信されます。以降のデータアップロードリクエストはそれ以上あなたのパスワードを使用しません。"
+"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 ""
+"あなたのOSMユーザ名とパスワードを入力してください。パスワードはJOSMのプリファ"
+"レンスに平文で保存され<strong>ません</strong>。OSMサーバへは<strong>一回だけ"
+"</strong>送信されます。以降のデータアップロードリクエストはそれ以上あなたのパ"
+"スワードを使用しません。"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:111
@@ -10627,7 +10932,7 @@
 "(HTTPS)."
 msgstr ""
-"<strong>警告:</strong>パスワードは<strong>平文で</strong>OSM "
-"webサイトに転送されます。OSMサーバが暗号化した通信方式(HTTPS)を使うまで、重要なパスワードは決して<strong>使わないでください</str"
-"ong>。"
+"<strong>警告:</strong>パスワードは<strong>平文で</strong>OSM webサイトに転送"
+"されます。OSMサーバが暗号化した通信方式(HTTPS)を使うまで、重要なパスワードは"
+"決して<strong>使わないでください</strong>。"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:173
@@ -10651,6 +10956,7 @@
 "in subsequent requests to gain access to the OSM API.</html>"
 msgstr ""
-"<html>OSMウェブサイトからのOAuthアクセストークン参照に成功しました。<strong>{0}</strong> "
-"をクリックしてトークンを受け入れてください。JOSM はこれを使って引き続きOSM APIへのアクセス取得要求を行います。</html>"
+"<html>OSMウェブサイトからのOAuthアクセストークン参照に成功しました。<strong>"
+"{0}</strong> をクリックしてトークンを受け入れてください。JOSM はこれを使って"
+"引き続きOSM APIへのアクセス取得要求を行います。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:329
@@ -10698,5 +11004,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:428
 msgid "The password cannot be empty. Please enter your OSM password"
-msgstr "パスワードは空白にできません。あなたのOSMパスワードを入力してください。"
+msgstr ""
+"パスワードは空白にできません。あなたのOSMパスワードを入力してください。"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:438
@@ -10710,6 +11017,7 @@
 "authorization process,<br>i.e. semi-automatic or manual authorization.</html>"
 msgstr ""
-"<html>OSMサーバからOAuthアクセストークンを参照する自動処理が<br>失敗しました。<br><br>やり直すか、手の認証処理(例:半自動認証や"
-"手動認証)<br>を選択してください。</html>"
+"<html>OSMサーバからOAuthアクセストークンを参照する自動処理が<br>失敗しまし"
+"た。<br><br>やり直すか、手の認証処理(例:半自動認証や手動認証)<br>を選択してく"
+"ださい。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:458
@@ -10732,9 +11040,10 @@
 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>"
-msgstr ""
-"<html>OSMサーバからのOAuthアクセストークン参照の自動手続きが<br>失敗しました。JOSM はユーザ {1} としての {0} "
-"へのログインに失敗しました。<br><br>ユーザ名とパスワードをチェックしてやり直してください。</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 ""
+"<html>OSMサーバからのOAuthアクセストークン参照の自動手続きが<br>失敗しまし"
+"た。JOSM はユーザ {1} としての {0} へのログインに失敗しました。<br><br>ユーザ"
+"名とパスワードをチェックしてやり直してください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:58
@@ -10743,5 +11052,6 @@
 "Please enter an OAuth Access Token which is authorized to access the OSM "
 "server ''{0}''."
-msgstr "OSMのサーバ ''{0}'' に認証されている OAuth 接続トークンを入力してください。"
+msgstr ""
+"OSMのサーバ ''{0}'' に認証されている OAuth 接続トークンを入力してください。"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:97
@@ -10771,5 +11081,6 @@
 "the OSM server ''{0}''.</body></html>"
 msgstr ""
-"<html><body>OSMサーバ \"{0}\" で認証されているOAuthアクセストークンを入力してください。</body></html>"
+"<html><body>OSMサーバ \"{0}\" で認証されているOAuthアクセストークンを入力して"
+"ください。</body></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:177
@@ -10780,5 +11091,7 @@
 msgid ""
 "The Access Token Key must not be empty. Please enter an Access Token Key"
-msgstr "アクセストークンキーは空白にできません。アクセストークンキーを入力してください。"
+msgstr ""
+"アクセストークンキーは空白にできません。アクセストークンキーを入力してくださ"
+"い。"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:197
@@ -10790,5 +11103,7 @@
 "The Access Token Secret must not be empty. Please enter an Access Token "
 "Secret"
-msgstr "アクセストークン秘密コードは入力必須です。アクセストークン秘密コードを入力してください。"
+msgstr ""
+"アクセストークン秘密コードは入力必須です。アクセストークン秘密コードを入力し"
+"てください。"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:233
@@ -10803,6 +11118,6 @@
 "your behalf (<a href=\"{0}\">more info...</a>)."
 msgstr ""
-"OAuth を使い、あなたはJOSMにマップデータとGPSトラックのアップロードをあなたの責任において許可します。 (<a "
-"href=\"{0}\">詳細...</a>)."
+"OAuth を使い、あなたはJOSMにマップデータとGPSトラックのアップロードをあなたの"
+"責任において許可します。 (<a href=\"{0}\">詳細...</a>)."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:126
@@ -10842,10 +11157,11 @@
 #, java-format
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
-msgstr "OSMウェブサイトから''{0}'' の応答としてセッションクッキーが返ってきませんでした"
+msgstr ""
+"OSMウェブサイトから''{0}'' の応答としてセッションクッキーが返ってきませんでし"
+"た"
 
 #: ../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 "OAuth ユーザー ''{0}'' パスワード ''***'' での認証に失敗しました。"
 
@@ -10903,5 +11219,7 @@
 "Select to grant JOSM the right to download your private GPS traces into JOSM "
 "layers"
-msgstr "選択してJOSMにあなたの代わりにあなたのプライベートGPSトレースをJOSMのレイヤーにダウンロードする権限を付与"
+msgstr ""
+"選択してJOSMにあなたの代わりにあなたのプライベートGPSトレースをJOSMのレイヤー"
+"にダウンロードする権限を付与"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
@@ -10960,5 +11278,6 @@
 "Token from ''{1}''.</html>"
 msgstr ""
-"<html><strong>{0}</strong>をクリックして ''{1}''からのリクエストトークンを参照してください。</html>"
+"<html><strong>{0}</strong>をクリックして ''{1}''からのリクエストトークンを参"
+"照してください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:182
@@ -10980,8 +11299,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 ""
 
@@ -11001,6 +11320,7 @@
 "authorization to the OSM server.<br><br>The access token is: </html>"
 msgstr ""
-"<html>アクセストークンの受信に成功しました。このトークンをacceptしてください。以後JOSMがOSMサーバでの認証にこのトークンを利用できるよう"
-"になります。<br><br>アクセストークンは以下の通りです: </html>"
+"<html>アクセストークンの受信に成功しました。このトークンをacceptしてくださ"
+"い。以後JOSMがOSMサーバでの認証にこのトークンを利用できるようになります。"
+"<br><br>アクセストークンは以下の通りです: </html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:348
@@ -11041,6 +11361,7 @@
 "''{3}''.</html>"
 msgstr ""
-"<html>アクセストークン ''{0}'' を使用して ''{1}'' のOSMサーバへの<br>アクセスに成功しました。<br>あなたはユーザ "
-"''{2}'' として ID ''{3}'' でOSMサーバにアクセスしています。</html>"
+"<html>アクセストークン ''{0}'' を使用して ''{1}'' のOSMサーバへの<br>アクセス"
+"に成功しました。<br>あなたはユーザ ''{2}'' として ID ''{3}'' でOSMサーバにア"
+"クセスしています。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
@@ -11068,8 +11389,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 ""
 
@@ -11086,4 +11407,8 @@
 "Carefully check the server<br>URL and your Internet connection.</html>"
 msgstr ""
+"<html>現在のユーザについてOSMサーバ ''{0}''からの情報参照に失敗。<br>これはお"
+"そらくテスト済みアクセストークンによる問題というより、<br>サーバ構成の問題で"
+"す。注意してサーバ<br>URL とあなたのインターネット接続をチェックしてくださ"
+"い。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
@@ -11093,15 +11418,16 @@
 "''{1}''.<br>The token ist probably invalid.</html>"
 msgstr ""
-"<html>トークン ''{1}''でOSMサーバ ''{0}'' "
-"へのリクエストへのサインに失敗しました。<br>おそらくトークンが不正です。</html>"
+"<html>トークン ''{1}''でOSMサーバ ''{0}'' へのリクエストへのサインに失敗しま"
+"した。<br>おそらくトークンが不正です。</html>"
 
 #: ../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>"
-msgstr ""
-"<html>テスト失敗。サーバから内部エラーの応答がありました。<br>JOSM "
-"はトークンが正しいかどうか判断できませんでした。しばらく経ってからやり直してください。</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 ""
+"<html>テスト失敗。サーバから内部エラーの応答がありました。<br>JOSM はトークン"
+"が正しいかどうか判断できませんでした。しばらく経ってからやり直してください。"
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
@@ -11151,5 +11477,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 "削除する列を選択してください。"
@@ -11200,5 +11526,7 @@
 "Display a moving icon representing the point on the synchronized track where "
 "the audio currently playing was recorded."
-msgstr "現在再生されているオーディオが記録された場所と同期して、その点を示すアイコンを動かして表示する。"
+msgstr ""
+"現在再生されているオーディオが記録された場所と同期して、その点を示すアイコン"
+"を動かして表示する。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:62
@@ -11206,5 +11534,7 @@
 "Put text labels against audio (and image and web) markers as well as their "
 "button icons."
-msgstr "ボタンアイコンと同様、オーディオ（と画像やWeb）のマーカーに対してテキストのラベルを付与する。"
+msgstr ""
+"ボタンアイコンと同様、オーディオ（と画像やWeb）のマーカーに対してテキストのラ"
+"ベルを付与する。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:65
@@ -11222,5 +11552,7 @@
 "Automatically create audio markers from trackpoints (rather than explicit "
 "waypoints) with names or descriptions."
-msgstr "（explicitウェイポイントではなく）自動的にトラックポイントからオーディオマーカーを作成し、名前と説明を付加する。"
+msgstr ""
+"（explicitウェイポイントではなく）自動的にトラックポイントからオーディオマー"
+"カーを作成し、名前と説明を付加する。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:84
@@ -11228,5 +11560,7 @@
 "Create audio markers at the position on the track corresponding to the "
 "modified time of each audio WAV file imported."
-msgstr "インポートされたそれぞれのオーディオWAVファイルが変更された時間に対応したトラックの位置にオーディオマーカーを作成してください。"
+msgstr ""
+"インポートされたそれぞれのオーディオWAVファイルが変更された時間に対応したト"
+"ラックの位置にオーディオマーカーを作成してください。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
@@ -11252,5 +11586,7 @@
 "Playback starts this number of seconds before (or after, if negative) the "
 "audio track position requested"
-msgstr "再生を、指定した秒数前の（マイナスの場合は秒数後の）オーディオトラック位置から開始する。"
+msgstr ""
+"再生を、指定した秒数前の（マイナスの場合は秒数後の）オーディオトラック位置か"
+"ら開始する。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
@@ -11465,5 +11801,7 @@
 "Automatically make a marker layer from any waypoints when opening a GPX "
 "layer."
-msgstr "自動的にマーカーレイヤーを、GPXレイヤーを開いたときにウェイポイントから作成する。"
+msgstr ""
+"自動的にマーカーレイヤーを、GPXレイヤーを開いたときにウェイポイントから作成す"
+"る。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
@@ -11502,6 +11840,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 "数式演算ではなく、テーブル検索によって矢印の方向を決める。"
 
@@ -11525,5 +11862,7 @@
 "All points and track segments will have the same color. Can be customized in "
 "Layer Manager."
-msgstr "全ての点とトラックセグメントは同じ色になります。レイヤー管理からカスタマイズ可能です。"
+msgstr ""
+"全ての点とトラックセグメントは同じ色になります。レイヤー管理からカスタマイズ"
+"可能です。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
@@ -11560,6 +11899,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 "見た目をスムースにするため、マップ表示にアンチエイリアス処理をかける。"
 
@@ -11631,5 +11969,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 "ビルトインのデフォルトを有効"
@@ -11649,6 +11987,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>:"
@@ -11714,5 +12051,7 @@
 "All installed plugins are up to date. JOSM does not have to download newer "
 "versions."
-msgstr "インストール済みのプラグインは全て最新です。JOSMはこれ以上新しいバージョンをダウンロードする必要はありません。"
+msgstr ""
+"インストール済みのプラグインは全て最新です。JOSMはこれ以上新しいバージョンを"
+"ダウンロードする必要はありません。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:332
@@ -11767,6 +12106,6 @@
 "started. So you need to <b>restart</b> JOSM to see your changes.</p>"
 msgstr ""
-"<p>ショートカットキーはJOSM起動時の操作に割り当てられていることに注意してください。このために変更を確認するにはJOSMを<b>再起動</b>する必"
-"要があります。</p>"
+"<p>ショートカットキーはJOSM起動時の操作に割り当てられていることに注意してくだ"
+"さい。このために変更を確認するにはJOSMを<b>再起動</b>する必要があります。</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:168
@@ -11775,6 +12114,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 ""
 
@@ -11787,9 +12126,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 ""
 
@@ -12086,8 +12425,9 @@
 #, java-format
 msgid ""
-"<html>Failed to load the list of style sources "
-"from<br>''{0}''.<br><br>Details (untranslated):<br>{1}</html>"
-msgstr ""
-"<html>''{0}'' からのスタイルソースのダウンロードに<br>失敗。<br><br>詳細 (未翻訳):<br>{1}</html>"
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+"<html>''{0}'' からのスタイルソースのダウンロードに<br>失敗。<br><br>詳細 (未"
+"翻訳):<br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
@@ -12097,5 +12437,5 @@
 msgstr "警告: スタイルリスト ''{0}'' 中に不正な形式のエントリ。入力値 ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #, java-format
 msgid ""
@@ -12105,18 +12445,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 ""
@@ -12125,5 +12465,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 ""
@@ -12132,5 +12472,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 ""
@@ -12138,10 +12478,12 @@
 "it?<br><br><table width=600>Error is: {1}</table></html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:133
+"<html>タグ付けプリセットソース: {0}をパースできません。本当にこれを使用します"
+"か？<br><br><table width=600>エラーコード: {1}</table></html>"
+
+#: ../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 "タグ付けプリセット"
@@ -12192,5 +12534,7 @@
 "Please click on <strong>Download list</strong> to download and display a "
 "list of available plugins."
-msgstr "<strong>ダウンロードリスト</strong>をクリックしてダウンロードし、利用可能なプラグインのリストを表示してください。"
+msgstr ""
+"<strong>ダウンロードリスト</strong>をクリックしてダウンロードし、利用可能なプ"
+"ラグインのリストを表示してください。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:118
@@ -12218,5 +12562,7 @@
 "Please decide whether JOSM shall automatically update active plugins at "
 "startup after an update of JOSM itself."
-msgstr "JOSMがJOSM自身を更新した後、再起動時にアクティブなプラグインを自動更新するかどうかを決めてください。"
+msgstr ""
+"JOSMがJOSM自身を更新した後、再起動時にアクティブなプラグインを自動更新するか"
+"どうかを決めてください。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:96
@@ -12228,5 +12574,7 @@
 "Please decide whether JOSM shall automatically update active plugins after a "
 "certain periode of time."
-msgstr "JOSMが一定時間経過後にアクティブなプラグインを自動更新するかどうかを決めてください。"
+msgstr ""
+"JOSMが一定時間経過後にアクティブなプラグインを自動更新するかどうかを決めてく"
+"ださい。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
@@ -12240,5 +12588,7 @@
 "<html>''{0}'' is not a valid OSM API URL.<br>Please check the spelling and "
 "validate again.</html>"
-msgstr "<html>''{0}'' は正しいOSM API URLではありません。<br>スペルをチェックして再確認してください。</html>"
+msgstr ""
+"<html>''{0}'' は正しいOSM API URLではありません。<br>スペルをチェックして再確"
+"認してください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
@@ -12250,6 +12600,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 ""
 
@@ -12260,5 +12610,6 @@
 "''{1}'' and your Internet connection and validate again.</html>"
 msgstr ""
-"<html>''{0}'' への接続に失敗。<br> ''{1}'' のスペルとインターネット接続をチェックして再認証してください。</html>"
+"<html>''{0}'' への接続に失敗。<br> ''{1}'' のスペルとインターネット接続を"
+"チェックして再認証してください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
@@ -12272,6 +12623,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 ""
 
@@ -12306,5 +12657,7 @@
 "Warning: Unsupported value in preference ''{0}'', got {1}''. Using "
 "authentication method ''Basic Authentication''."
-msgstr "警告: 初期設定 \"{1}\" に不正な値 \"{0}\" が入力されています。 Basic認証を使用してください。"
+msgstr ""
+"警告: 初期設定 \"{1}\" に不正な値 \"{0}\" が入力されています。 Basic認証を使"
+"用してください。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
@@ -12314,5 +12667,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
 msgid "When saving, keep backup files ending with a ~"
-msgstr "保存時に、バックアップファイルを、ファイル名の末尾に~をつけてとっておく。"
+msgstr ""
+"保存時に、バックアップファイルを、ファイル名の末尾に~をつけてとっておく。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
@@ -12349,6 +12703,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 "警告: 認証証明マネージャからのOAuthトークン参照に失敗。"
 
@@ -12361,10 +12714,13 @@
 "You do not have an Access Token yet to access the OSM server using OAuth. "
 "Please authorize first."
-msgstr "あなたにはOAuth を使用しているOSMサーバにアクセスするためのアクセストークンがまだありません。最初に認証してください。"
+msgstr ""
+"あなたにはOAuth を使用しているOSMサーバにアクセスするためのアクセストークンが"
+"まだありません。最初に認証してください。"
 
 #: ../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."
-msgstr "あなたにはOAuth を使用しているOSMサーバにアクセスするためのアクセストークンが既にあります。"
+msgid "You already have an Access Token to access the OSM server using OAuth."
+msgstr ""
+"あなたにはOAuth を使用しているOSMサーバにアクセスするためのアクセストークンが"
+"既にあります。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:258
@@ -12388,5 +12744,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:357
 msgid "Click test access to the OSM server with the current access token"
-msgstr "クリックして、現在のアクセストークンでOSMサーバにアクセスできるかをテストします"
+msgstr ""
+"クリックして、現在のアクセストークンでOSMサーバにアクセスできるかをテストしま"
+"す"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:62
@@ -12441,5 +12799,7 @@
 msgid ""
 "Please enter a username and a password if your proxy requires authentication."
-msgstr "使用するプロキシサーバに必要なときは、ユーザー名とパスワードを入力してください。"
+msgstr ""
+"使用するプロキシサーバに必要なときは、ユーザー名とパスワードを入力してくださ"
+"い。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:144
@@ -12457,9 +12817,9 @@
 #: ../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)"
-msgstr ""
-"標準のシステム設定を使用（無効、変更できるようにするには <tt>-"
-"Djava.net.useSystemProxies=true</tt>で起動してください）"
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+"標準のシステム設定を使用（無効、変更できるようにするには <tt>-Djava.net."
+"useSystemProxies=true</tt>で起動してください）"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:256
@@ -12475,5 +12835,7 @@
 "Warning: JOSM is configured to use proxies from the system setting, but the "
 "JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr "警告: JOSM はプロキシを参照するように設定されていますが、JVMはプロキシを参照するように設定されていません。"
+msgstr ""
+"警告: JOSM はプロキシを参照するように設定されていますが、JVMはプロキシを参照"
+"するように設定されていません。"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:58
@@ -12502,4 +12864,6 @@
 "be the same as in values"
 msgstr ""
+"破損したタグ付けプリセット \"{0}-{1}\" - display_values中のアイテム数は値の中"
+"にあるものと同じでなければなりません"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:469
@@ -12589,4 +12953,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 "プロパティを変更する"
@@ -12622,10 +12987,14 @@
 "URL from www.openstreetmap.org (you can paste a download URL here to specify "
 "a bounding box)"
-msgstr "www.openstreetmap.org のURL(ここにダウンロードURLを貼り付けてbboxを指定できます)"
+msgstr ""
+"www.openstreetmap.org のURL(ここにダウンロードURLを貼り付けてbboxを指定できま"
+"す)"
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java:46
 msgid ""
 "The current value is not a valid OSM ID. Please enter an integer value > 0"
-msgstr "現在の値は正しいOSMのIDではありません。ゼロより大きい整数値を入力してください。"
+msgstr ""
+"現在の値は正しいOSMのIDではありません。ゼロより大きい整数値を入力してくださ"
+"い。"
 
 #: ../core/src/org/openstreetmap/josm/io/AllFormatsImporter.java:15
@@ -12665,5 +13034,6 @@
 "Unexpected format of error header for conflict in changeset update. Got "
 "''{0}''"
-msgstr "変更セット更新中の競合に対するエラーヘッダの予期せぬ形式。入力値 ''{0}''"
+msgstr ""
+"変更セット更新中の競合に対するエラーヘッダの予期せぬ形式。入力値 ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:127
@@ -12698,10 +13068,13 @@
 "Cannot create a changeset query including both the query parameters ''uid'' "
 "and ''display_name''"
-msgstr "クエリパラメータ''uid'' と ''display_name'' の両方を含む変更セットクエリは作成できません"
+msgstr ""
+"クエリパラメータ''uid'' と ''display_name'' の両方を含む変更セットクエリは作"
+"成できません"
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:391
 #, java-format
 msgid "Unsupported parameter ''{0}'' in changeset query string"
-msgstr "変更セットクエリ文字列中にサポートされないパラメータ ''{0}'' があります"
+msgstr ""
+"変更セットクエリ文字列中にサポートされないパラメータ ''{0}'' があります"
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
@@ -12734,5 +13107,7 @@
 "Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
 "use no proxy."
-msgstr "警告: 環境設定 ''{0}'' が異常な値になっています。プロキシを使用しないときには ''{1}'' を設定してください。"
+msgstr ""
+"警告: 環境設定 ''{0}'' が異常な値になっています。プロキシを使用しないときに"
+"は ''{1}'' を設定してください。"
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
@@ -12741,5 +13116,7 @@
 "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
 "''{1}''."
-msgstr "警告: HTTPプロキシに異常な値が設定されてます。ホスト: ''{0}'' ポート:''{1}'' に設定されています。"
+msgstr ""
+"警告: HTTPプロキシに異常な値が設定されてます。ホスト: ''{0}'' ポート:''{1}'' "
+"に設定されています。"
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
@@ -12748,14 +13125,17 @@
 "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
 "''{1}''."
-msgstr "警告: SOCKS プロキシに異常な値が設定されてます。ホスト: ''{0}'' ポート:''{1}'' に設定されています。"
+msgstr ""
+"警告: SOCKS プロキシに異常な値が設定されてます。ホスト: ''{0}'' ポー"
+"ト:''{1}'' に設定されています。"
 
 #. 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
 msgid ""
 "Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
-msgstr "エラー: プロキシ ''{0}'' URI:''{1}'' への接続に失敗しました。例外内容: {2}"
+msgstr ""
+"エラー: プロキシ ''{0}'' URI:''{1}'' への接続に失敗しました。例外内容: {2}"
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
@@ -12770,5 +13150,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}''"
@@ -12803,5 +13183,7 @@
 "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
 "tracks."
-msgstr "備考：GPLは、OSMライセンスと互換性がありません。GPLでライセンスされているトラックをアップロードしないでください。"
+msgstr ""
+"備考：GPLは、OSMライセンスと互換性がありません。GPLでライセンスされているト"
+"ラックをアップロードしないでください。"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:44
@@ -12878,5 +13260,7 @@
 "Error occured while parsing gpx file {0}. Only part of the file will be "
 "available"
-msgstr "GPXファイル ''{0}'' のパース中にエラー発生。ファイルの一部だけが利用可能と思われます"
+msgstr ""
+"GPXファイル ''{0}'' のパース中にエラー発生。ファイルの一部だけが利用可能と思"
+"われます"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
@@ -12933,7 +13317,8 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
 #, java-format
-msgid ""
-"No primitive with id {0} in local dataset. Cannot infer primitive type."
-msgstr "ID {0} のプリミティブはローカルのデータセット内にはありません。プリミティブ種別が不明です。"
+msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
+msgstr ""
+"ID {0} のプリミティブはローカルのデータセット内にはありません。プリミティブ種"
+"別が不明です。"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308
@@ -12985,5 +13370,7 @@
 "Server replied with response code 404, retrying with an individual request "
 "for each primitive."
-msgstr "サーバがレスポンスコード404を返しました、各プリミティブの個別リクエストで最試行中"
+msgstr ""
+"サーバがレスポンスコード404を返しました、各プリミティブの個別リクエストで最試"
+"行中"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449
@@ -13040,5 +13427,7 @@
 "It supports protocol version 0.6, while the server says it supports {0} to "
 "{1}."
-msgstr "プロトコルバージョン0.6をサポートしていますが、サーバからの応答では {0} ら {1} をサポートしています。"
+msgstr ""
+"プロトコルバージョン0.6をサポートしていますが、サーバからの応答では {0} ら "
+"{1} をサポートしています。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:170
@@ -13048,83 +13437,87 @@
 
 #: ../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 "予想外の形式のID がサーバから返されました。入力値: ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:278
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
 "Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
-msgstr "変更されたプリミティブ ''{0}'' の新しいバージョンに予期せぬ形式。入力値: ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312
+msgstr ""
+"変更されたプリミティブ ''{0}'' の新しいバージョンに予期せぬ形式。入力値: "
+"''{1}''"
+
+#: ../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 "変更セット {0} を開きました"
 
-#: ../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 "変更セットID > 0 であるべきです。入力値: {0}"
 
-#: ../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 "変更セット {0} を更新中..."
 
-#: ../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 "diffアップロードのための変更セットを用意できませんでした。"
 
-#: ../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 "10秒待機中 ... "
 
-#: ../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 "{2} 秒で {1} 分の {0} 回の再試行を開始 ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:458
 msgid "OK - trying again."
 msgstr "OK - やり直しています。"
 
-#: ../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 "{1} 分の {0} 回の再試行を開始。"
 
-#: ../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 "現在の変更セットのID > 0 でなければなりません。現在のID: {0}."
 
-#: ../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}."
-msgstr "開かれた変更セットであるべきです。ID {0} の閉じられた変更セットを受け取りました。"
+msgstr ""
+"開かれた変更セットであるべきです。ID {0} の閉じられた変更セットを受け取りまし"
+"た。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88
@@ -13220,5 +13613,6 @@
 "Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
 "''{1}''."
-msgstr "OsmPrimitiveType 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
+msgstr ""
+"OsmPrimitiveType 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:231
@@ -13227,5 +13621,7 @@
 "Warning: unsupported start element ''{0}'' in changeset content at position "
 "({1},{2}). Skipping."
-msgstr "警告: 変更セットコンテンツ中 ({1},{2}) の位置にサポートされない開始エレメント ''{0}'' があります。スキップします。"
+msgstr ""
+"警告: 変更セットコンテンツ中 ({1},{2}) の位置にサポートされない開始エレメン"
+"ト ''{0}'' があります。スキップします。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:241
@@ -13234,6 +13630,6 @@
 "''create'', ''modify'', or ''delete''."
 msgstr ""
-"データの形式に誤りがあります。ノード、ウェイ、リレーションの何れかが \"cretate\"、\"modify\"、\"delete\" "
-"ではない箇所に記述されています。"
+"データの形式に誤りがあります。ノード、ウェイ、リレーションの何れかが "
+"\"cretate\"、\"modify\"、\"delete\" ではない箇所に記述されています。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:259
@@ -13242,5 +13638,7 @@
 "Warning: unsupported end element ''{0}'' in changeset content at position "
 "({1},{2}). Skipping."
-msgstr "警告: 変更セットコンテンツ中 ({1},{2}) の位置にサポートされない終了エレメント ''{0}'' があります。スキップします。"
+msgstr ""
+"警告: 変更セットコンテンツ中 ({1},{2}) の位置にサポートされない終了エレメン"
+"ト ''{0}'' があります。スキップします。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:307
@@ -13284,5 +13682,6 @@
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Aborting."
-msgstr "入力ストリームに未定義の要素 ''{0}'' が見つかりました。異常終了します。"
+msgstr ""
+"入力ストリームに未定義の要素 ''{0}'' が見つかりました。異常終了します。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:218
@@ -13301,4 +13700,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})"
@@ -13318,7 +13718,9 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error "
-"is:<br>{0}</html>"
-msgstr "<html>バックアップファイルのレストア中にエラー発生。<br>エラー: <br>{0}</html>"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
+"html>"
+msgstr ""
+"<html>バックアップファイルのレストア中にエラー発生。<br>エラー: <br>{0}</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
@@ -13345,9 +13747,9 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
-msgstr ""
-"要素 ''bounds'' に必要な属性がありません。入力値: "
-"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 ""
+"要素 ''bounds'' に必要な属性がありません。入力値: minlon=''{0}'',"
+"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
@@ -13377,5 +13779,6 @@
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
-msgstr "要素 <relation> の直接の子要素でないXML 要素 <member> が見つかりました。"
+msgstr ""
+"要素 <relation> の直接の子要素でないXML 要素 <member> が見つかりました。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
@@ -13388,6 +13791,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 "リレーション {0} のメンバーの属性 ''ref'' に不正な値。入力値: {1}"
 
@@ -13403,5 +13805,6 @@
 msgid ""
 "Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
-msgstr "リレーション {1} のメンバー {0} の属性 ''type'' に不正な値。入力値: {2}"
+msgstr ""
+"リレーション {1} のメンバー {0} の属性 ''type'' に不正な値。入力値: {2}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
@@ -13454,5 +13857,7 @@
 "WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
 "API version is ''{3}''. Got {1}."
-msgstr "要素 {0} の ''version'' 属性の値を {2} に正常化します、API バージョンは ''{3}''。入力値: {1}。"
+msgstr ""
+"要素 {0} の ''version'' 属性の値を {2} に正常化します、API バージョンは "
+"''{3}''。入力値: {1}。"
 
 #. should not happen. API version has been checked before
@@ -13478,5 +13883,7 @@
 "Illegal value for attribute ''changeset'' on new object {1}. Got {0}. "
 "Resetting to 0."
-msgstr "新しいオブジェクト {1} の属性 ''changeset'' に不正な値。入力値 {0}。0にリセットします。"
+msgstr ""
+"新しいオブジェクト {1} の属性 ''changeset'' に不正な値。入力値 {0}。0にリセッ"
+"トします。"
 
 #. for an existing primitive this is a problem
@@ -13506,5 +13913,6 @@
 msgid ""
 "Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr "外部ID ''{0}'' のウェイは外部ID ''{1}'' の存在しないノードを含んでいます。"
+msgstr ""
+"外部ID ''{0}'' のウェイは外部ID ''{1}'' の存在しないノードを含んでいます。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
@@ -13528,5 +13936,7 @@
 "Relation with external id ''{0}'' refers to a missing primitive with "
 "external id ''{1}''."
-msgstr "外部ID ''{0}'' のリレーションは外部ID ''{1}'' の存在しないプリミティブを参照しています。"
+msgstr ""
+"外部ID ''{0}'' のリレーションは外部ID ''{1}'' の存在しないプリミティブを参照"
+"しています。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
@@ -13658,5 +14068,6 @@
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
-msgstr "{0}% ({1}/{2}), 残り {3} 。リレーション ''{4}'' をアップロード中(ID: {5})"
+msgstr ""
+"{0}% ({1}/{2}), 残り {3} 。リレーション ''{4}'' をアップロード中(ID: {5})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:122
@@ -13706,5 +14117,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:112
 msgid "Download skipped"
-msgstr ""
+msgstr "ダウンロードはスキップされました"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:118
@@ -13713,5 +14124,7 @@
 "Warning: Cannot download plugin ''{0}''. Its download link is not known. "
 "Skipping download."
-msgstr "警告: プラグイン\"{0}\"がダウンロードできません。ダウンロードリンクが不明です。ダウンロードをスキップします。"
+msgstr ""
+"警告: プラグイン\"{0}\"がダウンロードできません。ダウンロードリンクが不明で"
+"す。ダウンロードをスキップします。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:139
@@ -13721,5 +14134,6 @@
 "valid URL. Skipping download."
 msgstr ""
-"警告: プラグイン\"{0}\"をダウンロードできません。ダウンロードリンク\"{1}\"は、不正なURLです。ダウンロードスキップします。"
+"警告: プラグイン\"{0}\"をダウンロードできません。ダウンロードリンク\"{1}"
+"\"は、不正なURLです。ダウンロードスキップします。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:167
@@ -13752,6 +14166,7 @@
 "disabled.<br>Delete from preferences?</html>"
 msgstr ""
-"<html>プラグイン\"{0}\"の読み込みが要求されました。<br>このプラグインは開発されておらず、エラーを起こすおそれがあります。<br>使用しな"
-"いようにすべきです。<br>設定から削除しますか？</html>"
+"<html>プラグイン\"{0}\"の読み込みが要求されました。<br>このプラグインは開発さ"
+"れておらず、エラーを起こすおそれがあります。<br>使用しないようにすべきです。"
+"<br>設定から削除しますか？</html>"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:167
@@ -13760,5 +14175,6 @@
 "updated as well.<br><br>Update plugins now?"
 msgstr ""
-"JOSMソフトウエアは更新されました。<br>問題が起こらないよう、プラグインも同様に更新すべきです。<br><br>プラグインを更新しますか？"
+"JOSMソフトウエアは更新されました。<br>問題が起こらないよう、プラグインも同様"
+"に更新すべきです。<br><br>プラグインを更新しますか？"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:183
@@ -13783,5 +14199,7 @@
 "Skipping plugin update after JOSM upgrade. Automatic update at startup is "
 "disabled."
-msgstr "JOSMアップグレード後、プラグインの更新をスキップします。開始時の自動更新は停止します。"
+msgstr ""
+"JOSMアップグレード後、プラグインの更新をスキップします。開始時の自動更新は停"
+"止します。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:217
@@ -13789,5 +14207,7 @@
 "Skipping plugin update after elapsed update interval. Automatic update at "
 "startup is disabled."
-msgstr "更新間隔が過ぎた後のプラグイン更新をスキップします。開始時の自動更新を停止します。"
+msgstr ""
+"更新間隔が過ぎた後のプラグイン更新をスキップします。開始時の自動更新を停止し"
+"ます。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
@@ -13795,5 +14215,7 @@
 "Running plugin update after JOSM upgrade. Automatic update at startup is "
 "enabled."
-msgstr "JOSMアップグレード後に、プラグイン更新を行います。開始時の自動更新を有効にします。"
+msgstr ""
+"JOSMアップグレード後に、プラグイン更新を行います。開始時の自動更新を有効にし"
+"ます。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:226
@@ -13801,5 +14223,6 @@
 "Running plugin update after elapsed update interval. Automatic update at "
 "startup is disabled."
-msgstr "更新間隔が過ぎた後のプラグイン更新を行います。開始時の自動更新は停止します。"
+msgstr ""
+"更新間隔が過ぎた後のプラグイン更新を行います。開始時の自動更新は停止します。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:232
@@ -13807,5 +14230,6 @@
 msgid ""
 "Unexpected value ''{0}'' for preference ''{1}''. Assuming value ''ask''."
-msgstr "設定\"{1}\"に予期しない値\"{0}\"が指定されました。\"Ask\"を想定します。"
+msgstr ""
+"設定\"{1}\"に予期しない値\"{0}\"が指定されました。\"Ask\"を想定します。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
@@ -13822,9 +14246,10 @@
 #, java-format
 msgid ""
-"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is "
-"{2}.<br>You have to update JOSM in order to use this plugin.</html>"
-msgstr ""
-"<html>プラグイン {0} には JOSM バージョン {1} が必要です。現在の JOSM バージョンは {2} "
-"です。<br>このプラグインを使うにはJOSMを更新しなければなりません。</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 ""
+"<html>プラグイン {0} には JOSM バージョン {1} が必要です。現在の JOSM バー"
+"ジョンは {2} です。<br>このプラグインを使うにはJOSMを更新しなければなりませ"
+"ん。</html>"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
@@ -13894,5 +14319,6 @@
 "Please open the Preference Dialog after JOSM has started and try to update "
 "them manually."
-msgstr[0] "JOSMが開始してからプリファレンスダイアログを開いて手動更新してみてください。"
+msgstr[0] ""
+"JOSMが開始してからプリファレンスダイアログを開いて手動更新してみてください。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
@@ -13939,6 +14365,6 @@
 "installation. JOSM is still going to load the old plugin version."
 msgstr ""
-"警告: ダウンロード済みのプラグイン ''{0}'' "
-"のインストールに失敗。インストールをスキップします。JOSMは古いプラグインのバージョンをロードします。"
+"警告: ダウンロード済みのプラグイン ''{0}'' のインストールに失敗。インストール"
+"をスキップします。JOSMは古いプラグインのバージョンをロードします。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
@@ -13947,5 +14373,7 @@
 "Warning: failed to install plugin ''{0}'' from temporary download file "
 "''{1}''. Renaming failed."
-msgstr "警告: 一時ダウンロードファイル ''{1}'' からのプラグイン ''{0}'' のインストールに失敗。リネームに失敗。"
+msgstr ""
+"警告: 一時ダウンロードファイル ''{1}'' からのプラグイン ''{0}'' のインストー"
+"ルに失敗。リネームに失敗。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
@@ -13968,5 +14396,7 @@
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
-msgstr "バグレポートをする前に、最新バージョンのプラグインにアップデートしてください。"
+msgstr ""
+"バグレポートをする前に、最新バージョンのプラグインにアップデートしてくださ"
+"い。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:828
@@ -13978,5 +14408,7 @@
 "The plugin has been removed from the configuration. Please restart JOSM to "
 "unload the plugin."
-msgstr "プラグインは設定から削除されています。プラグインをアンロードするためにJOSMを再起動してください。"
+msgstr ""
+"プラグインは設定から削除されています。プラグインをアンロードするためにJOSMを"
+"再起動してください。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:942
@@ -13993,5 +14425,7 @@
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
 "change it later)"
-msgstr "この決定を記憶し、次回からは確認しない (プリファレンス>プラグイン で後から変更できます)"
+msgstr ""
+"この決定を記憶し、次回からは確認しない (プリファレンス>プラグイン で後から変"
+"更できます)"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:86
@@ -14029,7 +14463,8 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:147
 #, java-format
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
-msgstr "警告: プラグイン情報取得のためのファイル ''{0}'' のスキャンに失敗。スキップします。"
+msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgstr ""
+"警告: プラグイン情報取得のためのファイル ''{0}'' のスキャンに失敗。スキップし"
+"ます。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:109
@@ -14058,5 +14493,6 @@
 "from plugin site ''{1}''."
 msgstr ""
-"警告: プラグインディレクトリ ''{0}'' の作成に失敗。プラグインサイト ''{1}'' からのプラグインリストをキャッシュできません。"
+"警告: プラグインディレクトリ ''{0}'' の作成に失敗。プラグインサイト ''{1}'' "
+"からのプラグインリストをキャッシュできません。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263
@@ -14076,5 +14512,7 @@
 "Failed to parse plugin list document from site ''{0}''. Skipping site. "
 "Exception was: {1}"
-msgstr "サイト ''{0}'' からのプラグインリスト文書のパースに失敗。サイトをスキップします。例外コード: {1}"
+msgstr ""
+"サイト ''{0}'' からのプラグインリスト文書のパースに失敗。サイトをスキップしま"
+"す。例外コード: {1}"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:339
@@ -14096,5 +14534,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"
@@ -14111,6 +14549,6 @@
 "file a bug report."
 msgstr ""
-"予期せぬ例外が発生。<br>これはたいていコーディングエラーです。最新の<br>JOSMを実行している場合は、おおらかな気持ちでバグレポートをファイルして"
-"ください。"
+"予期せぬ例外が発生。<br>これはたいていコーディングエラーです。最新の<br>JOSM"
+"を実行している場合は、おおらかな気持ちでバグレポートをファイルしてください。"
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
@@ -14122,5 +14560,7 @@
 "You have encountered an error in JOSM. Before you file a bug report make "
 "sure you have updated to the latest version of JOSM here:"
-msgstr "JOSMでエラーが発生しました。バグレポートをファイルする前にJOSMの最新バージョンに更新したかどうかこちらで確認してください:"
+msgstr ""
+"JOSMでエラーが発生しました。バグレポートをファイルする前にJOSMの最新バージョ"
+"ンに更新したかどうかこちらで確認してください:"
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
@@ -14128,5 +14568,7 @@
 "You should also update your plugins. If neither of those help please file a "
 "bug report in our bugtracker using this link:"
-msgstr "プラグインも更新する必要があります。どちらも役に立たない場合はこのリンクを使ってバグトラッカーにバグレポートをファイルしてください:"
+msgstr ""
+"プラグインも更新する必要があります。どちらも役に立たない場合はこのリンクを"
+"使ってバグトラッカーにバグレポートをファイルしてください:"
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
@@ -14135,5 +14577,7 @@
 "you. Please include information on how to reproduce the error and try to "
 "supply as much detail as possible."
-msgstr "下記エラー情報には既にあなたのために情報が埋められています。エラーを再現するための情報をできるだけ詳細に追加してみてください。"
+msgstr ""
+"下記エラー情報には既にあなたのために情報が埋められています。エラーを再現する"
+"ための情報をできるだけ詳細に追加してみてください。"
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
@@ -14141,5 +14585,6 @@
 "Alternatively, if that does not work you can manually fill in the "
 "information below at this URL:"
-msgstr "ちゃんと機能していない場合は、代わりに次のURLで手作業で情報を入力できます:"
+msgstr ""
+"ちゃんと機能していない場合は、代わりに次のURLで手作業で情報を入力できます:"
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
@@ -14157,5 +14602,6 @@
 "the server URL in your preferences and your internet connection.</html>"
 msgstr ""
-"<html>OSM サーバ {0} との通信の初期化に失敗しました。<br>設定のサーバURLとインターネット接続をチェックしてください。</html>"
+"<html>OSM サーバ {0} との通信の初期化に失敗しました。<br>設定のサーバURLとイ"
+"ンターネット接続をチェックしてください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
@@ -14175,6 +14621,7 @@
 "reference to relation {0}, and upload again.</html>"
 msgstr ""
-"<html><strong>リレーション {0}</strong>の削除に<strong>失敗</strong>。リレーション {1} "
-"がまだ参照しています。<br>リレーション {1} をロードし、リレーション {0} への参照を削除し、再度アップロードしてください。</html>"
+"<html><strong>リレーション {0}</strong>の削除に<strong>失敗</strong>。リレー"
+"ション {1} がまだ参照しています。<br>リレーション {1} をロードし、リレーショ"
+"ン {0} への参照を削除し、再度アップロードしてください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:105
@@ -14182,37 +14629,37 @@
 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>"
-msgstr ""
-"<html>サーバへのアップロードは<strong>失敗しました。</strong> "
-"現在の<br>データセットは前提条件に違反しています。<br>エラーメッセージ:<br>{0}</html>"
+"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
+"html>"
+msgstr ""
+"<html>サーバへのアップロードは<strong>失敗しました。</strong> 現在の<br>デー"
+"タセットは前提条件に違反しています。<br>エラーメッセージ:<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:113
 #, 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>"
-msgstr ""
-"<html>ユーザー ''{0}'' "
-"でのOSMサーバへの認証に失敗しました。<br>環境設定のユーザ名とパスワードの設定内容を確認してみてください。</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 ""
+"<html>ユーザー ''{0}'' でのOSMサーバへの認証に失敗しました。<br>環境設定の"
+"ユーザ名とパスワードの設定内容を確認してみてください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
 #, 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>"
-msgstr ""
-"<html>OSMサーバへの OAuth トークン \"{0}\" での認証に失敗しました。<br>環境設定での "
-"OAuthトークンを再取得してください。</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 ""
+"<html>OSMサーバへの OAuth トークン \"{0}\" での認証に失敗しました。<br>環境設"
+"定での OAuthトークンを再取得してください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:133
 #, 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 ""
 
@@ -14222,5 +14669,7 @@
 "<html>Communication with the OSM server ''{0}'' timed out. Please retry "
 "later.</html>"
-msgstr "<html>OSM サーバ ''{0}'' との通信がタイムアウトしました。しばらくしてからやり直してください。</html>"
+msgstr ""
+"<html>OSM サーバ ''{0}'' との通信がタイムアウトしました。しばらくしてからやり"
+"直してください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
@@ -14232,7 +14681,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 ""
 
@@ -14242,5 +14691,7 @@
 "<html>Closing of changeset <strong>{0}</strong> failed <br>because it has "
 "already been closed.</html>"
-msgstr "<html>変更セット<strong>{0}</strong>を閉じることができません。<br>既に閉じられています。</html>"
+msgstr ""
+"<html>変更セット<strong>{0}</strong>を閉じることができません。<br>既に閉じら"
+"れています。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
@@ -14250,5 +14701,6 @@
 "already been closed on {1}.</html>"
 msgstr ""
-"<html>変更セット<strong>{0}</strong>を閉じることができません。<br> {1} で既に閉じられています。</html>"
+"<html>変更セット<strong>{0}</strong>を閉じることができません。<br> {1} で既に"
+"閉じられています。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:227
@@ -14257,5 +14709,7 @@
 "<html>The server reported that it has detected a conflict.<br>Error message "
 "(untranslated):<br>{0}</html>"
-msgstr "<html>サーバから競合検知の報告がありました。<br>エラーメッセージ (未翻訳):<br>{0}</html>"
+msgstr ""
+"<html>サーバから競合検知の報告がありました。<br>エラーメッセージ (未翻訳):"
+"<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:233
@@ -14269,5 +14723,6 @@
 "already been closed on {1}.</html>"
 msgstr ""
-"<html>変更セットのアップロードに失敗しました。<strong>{0}</strong><br>既に閉じられています {1}。<html>"
+"<html>変更セットのアップロードに失敗しました。<strong>{0}</strong><br>既に閉"
+"じられています {1}。<html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
@@ -14278,6 +14733,7 @@
 "applet and because you did not load your applet from ''{1}''.</html>"
 msgstr ""
-"<html>リモートサーバ<br>''{0}''<br>への接続にセキュリティ上の理由で接続を開けませんでした。おそらくアプレットを実行しているがアプレッ"
-"トを ''{1}' からロードしていないためだと思われます。</html>"
+"<html>リモートサーバ<br>''{0}''<br>への接続にセキュリティ上の理由で接続を開け"
+"ませんでした。おそらくアプレットを実行しているがアプレットを ''{1}' からロー"
+"ドしていないためだと思われます。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:304
@@ -14286,5 +14742,7 @@
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
 "check your internet connection.</html>"
-msgstr "<html>リモートサーバ ''{0}' への接続が開けません。<br>インターネット接続をチェックしてください。</html>"
+msgstr ""
+"<html>リモートサーバ ''{0}' への接続が開けません。<br>インターネット接続を"
+"チェックしてください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:321
@@ -14294,6 +14752,6 @@
 "problem with transferring data.<br>Details(untranslated): {1}</html>"
 msgstr ""
-"<html>データのアップロード先またはダウンロード元<br>''{0}''<br>で、データ転送中に問題が発生したために処理が失敗しました。<br>詳細"
-"（原文）: {1}</html>"
+"<html>データのアップロード先またはダウンロード元<br>''{0}''<br>で、データ転送"
+"中に問題が発生したために処理が失敗しました。<br>詳細（原文）: {1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:336
@@ -14303,17 +14761,15 @@
 "and/or inconsistent.<br><br>Details (untranslated): {0}</html>"
 msgstr ""
-"<html>データのダウンロードに失敗。フォーマットがサポートされていない、形式が不正、矛盾している、のいずれかです。<br><br>詳細 (未翻訳): "
-"{0}</html>"
+"<html>データのダウンロードに失敗。フォーマットがサポートされていない、形式が"
+"不正、矛盾している、のいずれかです。<br><br>詳細 (未翻訳): {0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:352
 #, 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>"
-msgstr ""
-"<html>OSM "
-"サーバ<br>''{0}''<br>からサーバの内部エラーの連絡がありました。<br>おそらく一時的な問題です。後ほどやり直してみてください。</html"
-">"
+"<html>The OSM server<br>''{0}''<br>reported an internal server error."
+"<br>This is most likely a temporary problem. Please try again later.</html>"
+msgstr ""
+"<html>OSM サーバ<br>''{0}''<br>からサーバの内部エラーの連絡がありました。<br>"
+"おそらく一時的な問題です。後ほどやり直してみてください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
@@ -14324,10 +14780,11 @@
 #: ../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."
-msgstr ""
-"ダウンロードしようとしたエリアが大きすぎるか、リクエストが大きすぎます。<br>もっと小さいエリアでリクエストするか、OSM "
-"コミュニティから提供されたエクスポートファイルを使用してください。"
+"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 ""
+"ダウンロードしようとしたエリアが大きすぎるか、リクエストが大きすぎます。<br>"
+"もっと小さいエリアでリクエストするか、OSM コミュニティから提供されたエクス"
+"ポートファイルを使用してください。"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:374
@@ -14352,6 +14809,7 @@
 "preferences and your internet connection.</html>"
 msgstr ""
-"<html>リモートサーバ<br>''{0}''.<br>への接続を開けませんでした。ホスト名 ''{1}'' を解決できません。<br>設定のAPI "
-"URL とインターネット接続をチェックしてください。</html>"
+"<html>リモートサーバ<br>''{0}''.<br>への接続を開けませんでした。ホスト名 "
+"''{1}'' を解決できません。<br>設定のAPI URL とインターネット接続をチェックし"
+"てください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:487
@@ -14360,11 +14818,11 @@
 "<html>The server reports that an object is deleted.<br><strong>Uploading "
 "failed</strong> if you tried to update or delete this object.<br> "
-"<strong>Downloading failed</strong> if you tried to download this "
-"object.<br><br>The error message is:<br>{0}</html>"
-msgstr ""
-"<html>サーバからオブジェクト削除の報告がありました。<br>このオブジェクトを更新または削除しようとしたのであれば<strong>アップロードは失敗"
-"</strong>です。<br> "
-"このオブジェクトをダウンロードしようとしたのであれば<strong>ダウンロードは失敗</strong>です。<br><br>エラーメッセージ:<br>{"
-"0}</html>"
+"<strong>Downloading failed</strong> if you tried to download this object."
+"<br><br>The error message is:<br>{0}</html>"
+msgstr ""
+"<html>サーバからオブジェクト削除の報告がありました。<br>このオブジェクトを更"
+"新または削除しようとしたのであれば<strong>アップロードは失敗</strong>です。"
+"<br> このオブジェクトをダウンロードしようとしたのであれば<strong>ダウンロード"
+"は失敗</strong>です。<br><br>エラーメッセージ:<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/I18n.java:439
@@ -14384,5 +14842,7 @@
 "Warning: failed to access directory ''{0}'' for security reasons. Exception "
 "was: {1}"
-msgstr "警告: セキュリティ上の理由によりディレクトリ ''{0}'' へのアクセスに失敗。例外コード: {1}"
+msgstr ""
+"警告: セキュリティ上の理由によりディレクトリ ''{0}'' へのアクセスに失敗。例外"
+"コード: {1}"
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237
@@ -14391,5 +14851,7 @@
 "Fatal: failed to locate image ''{0}''. This is a serious configuration "
 "problem. JOSM will stop working."
-msgstr "Fatal: 画像 ''{0}'' の配置に失敗しました。これは深刻な構成の問題です。JOSM は動作停止します。"
+msgstr ""
+"Fatal: 画像 ''{0}'' の配置に失敗しました。これは深刻な構成の問題です。JOSM は"
+"動作停止します。"
 
 #: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
@@ -14398,5 +14860,7 @@
 "Warning: failed to derive wiki language prefix from JOSM locale code "
 "''{0}''. Using default code ''en''."
-msgstr "警告: JOSMの言語コード \"{0}\"から、wiki言語設定の導出に失敗しました。既定の\"en\"を使用します。"
+msgstr ""
+"警告: JOSMの言語コード \"{0}\"から、wiki言語設定の導出に失敗しました。既定の"
+"\"en\"を使用します。"
 
 #: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
@@ -14404,5 +14868,7 @@
 "Failed to open URL. There is currently no platform set. Please set a "
 "platform first."
-msgstr "URLのオープンに失敗。現在プラットフォームセットがありません。最初にプラットフォームをセットしてください。"
+msgstr ""
+"URLのオープンに失敗。現在プラットフォームセットがありません。最初にプラット"
+"フォームをセットしてください。"
 
 #. This list if far from complete!
@@ -14426,5 +14892,6 @@
 "\n"
 msgstr ""
-"キーボードショートカット\"{0}\"がすでにアクション\"{3}\"({4})のためにとられているために\n"
+"キーボードショートカット\"{0}\"がすでにアクション\"{3}\"({4})のためにとられて"
+"いるために\n"
 "アクション\"{1}\"({2})への割り当てに失敗しました。\n"
 "\n"
@@ -14464,5 +14931,6 @@
 "Warning: failed to read MOTD from ''{0}'' for security reasons. Exception "
 "was: {1}"
-msgstr "警告: セキュリティ上の理由で ''{0}'' からMOTD の読み込みに失敗。例外: {1}"
+msgstr ""
+"警告: セキュリティ上の理由で ''{0}'' からMOTD の読み込みに失敗。例外: {1}"
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107
@@ -14471,5 +14939,7 @@
 "Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
 "geometry from preferences."
-msgstr "キー ''{0}'' の設定は ''{1}'' を含んでいません。設定から window geometry を復元できません。"
+msgstr ""
+"キー ''{0}'' の設定は ''{1}'' を含んでいません。設定から window geometry を復"
+"元できません。"
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:113
@@ -14479,6 +14949,6 @@
 "{2}. Cannot restore window geometry from preferences."
 msgstr ""
-"キー ''{0}'' の設定は ''{1}'' にint 値を与えていません。入力値: {2}。設定から window geometry "
-"を復元できません。"
+"キー ''{0}'' の設定は ''{1}'' にint 値を与えていません。入力値: {2}。設定か"
+"ら window geometry を復元できません。"
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:115
@@ -14488,6 +14958,6 @@
 "{2}. Cannot restore window geometry from preferences."
 msgstr ""
-"キー ''{0}'' の設定中のフィールド ''{1}'' の解析に失敗しました。例外コード: {2}。設定から window geometry "
-"を復元できません。"
+"キー ''{0}'' の設定中のフィールド ''{1}'' の解析に失敗しました。例外コード: "
+"{2}。設定から window geometry を復元できません。"
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:122
@@ -14496,5 +14966,7 @@
 "Preference with key ''{0}'' does not exist. Cannot restore window geometry "
 "from preferences."
-msgstr "キー ''{0}'' の設定が存在しません。設定から window geometry を復元できません。"
+msgstr ""
+"キー ''{0}'' の設定が存在しません。設定から window geometry を復元できませ"
+"ん。"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
@@ -14536,5 +15008,7 @@
 "Identifiable (shown in trace list and as identifiable, ordered points with "
 "timestamps)"
-msgstr "識別公開 (トレースリストの指定ポイントとタイムスタンプを自身によるものとして公開する)"
+msgstr ""
+"識別公開 (トレースリストの指定ポイントとタイムスタンプを自身によるものとして"
+"公開する)"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
@@ -14804,4 +15278,6 @@
 "around a chosen pivot."
 msgstr ""
+"選択されたウェイセグメントの組を、そのひとつを選ばれたピボットのまわりで回転"
+"させることで平行にします。"
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:38
@@ -14829,4 +15305,6 @@
 "Your action is being reverted."
 msgstr ""
+"アラインするとノードを世界の外におくことになります。\n"
+"あなたの操作を元に戻しています。"
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
@@ -14876,6 +15354,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>"
@@ -14902,6 +15380,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"
@@ -14939,6 +15417,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"
@@ -14954,7 +15432,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"
@@ -15005,9 +15483,29 @@
 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 "ビルのサイズをセット"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#, fuzzy
+msgid "Rotate crosshair"
+msgstr "右へ回転"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#, fuzzy
+msgid "Advanced settings"
+msgstr "詳細設定を構成"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#, fuzzy
+msgid "Building tag:"
+msgstr "建物"
+
+#: ../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"
@@ -15016,35 +15514,48 @@
 #: ../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 "建物を作成"
+
+#: ../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
+#, fuzzy
+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"
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:379
+#, fuzzy
+msgid "Point on the corner of the building to start drawing"
+msgstr "建物のコーナーをポイントして描画を開始"
+
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:381
+#, fuzzy
+msgid "Point on opposite end of the building"
 msgstr "建物の反対側の終端をポイント"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
-msgid "Set width of building"
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:383
+#, fuzzy
+msgid "Set width of the building"
 msgstr "ビルの幅をセット"
 
@@ -15055,5 +15566,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
 msgid "Extract building on click (vector images only)"
-msgstr ""
+msgstr "クリックして建物を抽出(ベクター画像のみ)"
 
 #. group "Man-Made"
@@ -15197,5 +15708,7 @@
 msgid ""
 "Warning: failed to put option pane dialog always on top. Exception was: {0}"
-msgstr "警告: オプションペインダイアログを常時トップに表示するのに失敗しました。例外コード: {0}"
+msgstr ""
+"警告: オプションペインダイアログを常時トップに表示するのに失敗しました。例外"
+"コード: {0}"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
@@ -15230,7 +15743,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--waterway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15240,5 +15753,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15248,5 +15761,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15262,5 +15775,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15270,5 +15783,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15276,8 +15789,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 "水域(湖沼)"
@@ -15299,5 +15812,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15306,5 +15819,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15313,5 +15826,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15320,5 +15833,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15327,5 +15840,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15334,10 +15847,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 "住所"
@@ -15366,18 +15879,16 @@
 #: ../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."
-msgstr ""
-"フランス cadastre wms (www.cadastre.gouv.fr) "
-"の特別なハンドラ<BR><BR>このプラグインで作成されたデータをアップロードする前に、こちらの利用許諾条件を読んでください (フランス語): "
-"<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>"
+"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 ""
+"フランス cadastre wms (www.cadastre.gouv.fr) の特別なハンドラ<BR><BR>このプラ"
+"グインで作成されたデータをアップロードする前に、こちらの利用許諾条件を読んで"
+"ください (フランス語): <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>"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98
@@ -15404,5 +15915,6 @@
 "Invert the original black and white colors (and all intermediate greys). "
 "Useful for texts on dark backgrounds."
-msgstr "元の白と黒(すべてのグレーも)を反転します。背景が暗いテキストで役に立ちます。"
+msgstr ""
+"元の白と黒(すべてのグレーも)を反転します。背景が暗いテキストで役に立ちます。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
@@ -15568,5 +16080,6 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:221
 msgid "Please, enable auto-sourcing and check cadastre millesime."
-msgstr "自動ソース作成を有効にし、土地台帳-レジストリビンテージをチェックしてください"
+msgstr ""
+"自動ソース作成を有効にし、土地台帳-レジストリビンテージをチェックしてください"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66
@@ -15728,5 +16241,6 @@
 msgid ""
 "Cannot load cache {0} which is not compatible with current projection zone"
-msgstr "現在の投影法ゾーンと合っていないため、キャッシュ {0}の読み込みはできません。"
+msgstr ""
+"現在の投影法ゾーンと合っていないため、キャッシュ {0}の読み込みはできません。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63
@@ -15734,10 +16248,14 @@
 msgid ""
 "Selected file {0} is not a cache file from this plugin (invalid extension)"
-msgstr "選択されたファイル {0} はこのプラグインからのキャッシュファイルではありません(不正なエクステンション)"
+msgstr ""
+"選択されたファイル {0} はこのプラグインからのキャッシュファイルではありません"
+"(不正なエクステンション)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70
 #, java-format
 msgid "The location {0} is already on screen. Cache not loaded."
-msgstr "ロケーション {0} は既にスクリーン上にあります。キャッシュがロードされていません。"
+msgstr ""
+"ロケーション {0} は既にスクリーン上にあります。キャッシュがロードされていませ"
+"ん。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
@@ -15766,6 +16284,6 @@
 "known by www.cadastre.gouv.fr .</html>"
 msgstr ""
-"<html>町、村または市区の名前を入力してください。<br>文法や句読点はwww.cadastre.gouv.fr "
-"に従ってください。(フランス語の場合)</html>"
+"<html>町、村または市区の名前を入力してください。<br>文法や句読点はwww."
+"cadastre.gouv.fr に従ってください。(フランス語の場合)</html>"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:74
@@ -15821,6 +16339,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 "空のレイヤー"
@@ -15854,5 +16372,7 @@
 "Unsupported cache file version; found {0}, expected {1}\n"
 "Create a new one."
-msgstr "サポートされないキャッシュファイルのバージョン; {0} が見つかりましたが、 {1} であるべきです"
+msgstr ""
+"サポートされないキャッシュファイルのバージョン; {0} が見つかりましたが、 {1} "
+"であるべきです"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
@@ -15863,5 +16383,6 @@
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
-msgstr "キャッシュのランベルトzone {0} は現在のランベルトzone {1} と互換がありません"
+msgstr ""
+"キャッシュのランベルトzone {0} は現在のランベルトzone {1} と互換がありません"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
@@ -16005,4 +16526,52 @@
 msgstr "GPXデータのレイヤーがありません"
 
+#: ../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 "動物園の編集"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#, fuzzy
+msgid "Name:"
+msgstr "名前"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#, fuzzy
+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
+#, fuzzy, java-format
+msgid "Delete tool \"{0}\"?"
+msgstr "ノード {0} を削除"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:74
+msgid "Are you sure?"
+msgstr "よろしいですか？"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
+#, fuzzy
+msgid "New tool..."
+msgstr "新しいロール"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
+#, fuzzy
+msgid "Install"
+msgstr "工業"
+
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
 msgid "Position only"
@@ -16124,7 +16693,7 @@
 "plugin/"
 msgstr ""
-"rxtxSerialライブラリ からロードすることができません。もし、それをインストールするためのサポートが必要であれば、Globalsat "
-"ホームページ（ http://www.raphael-mack.de/josm-globalsat-gpx-import-plugin/ "
-"）を試してください。"
+"rxtxSerialライブラリ からロードすることができません。もし、それをインストール"
+"するためのサポートが必要であれば、Globalsat ホームページ（ http://www."
+"raphael-mack.de/josm-globalsat-gpx-import-plugin/ ）を試してください。"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
@@ -16135,5 +16704,6 @@
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:108
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
-msgstr "グローバルサット・データロガー DG1000からGPXレイヤーにデータをインポート"
+msgstr ""
+"グローバルサット・データロガー DG1000からGPXレイヤーにデータをインポート"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:115
@@ -16272,5 +16842,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#. 
+#.
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16391,6 +16961,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 "各生成されたウェイで許されるセグメントの最大数。既定値は250"
 
@@ -16399,5 +16968,7 @@
 "Maximum number of nodes to generate before bailing out (before simplifying "
 "lines). Default 50000."
-msgstr "データを間引く前（ラインを単純化する前）に生成するノードの最大数。（デフォルト50000）"
+msgstr ""
+"データを間引く前（ラインを単純化する前）に生成するノードの最大数。（デフォル"
+"ト50000）"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
@@ -16405,12 +16976,15 @@
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
 "in the range 0-255. Default 90."
-msgstr "水域として認めるグレーの最大値（Landsat IR-1 データに基づく）。0-255の範囲にである．デフォルトは90。"
+msgstr ""
+"水域として認めるグレーの最大値（Landsat IR-1 データに基づく）。0-255の範囲に"
+"である．デフォルトは90。"
 
 #: ../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."
-msgstr "ダグラス・ポイカーフィルタ（ライン簡素化）の精度。<br>小さいほど細かく描画を行います。 既定値 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 ""
+"ダグラス・ポイカーフィルタ（ライン簡素化）の精度。<br>小さいほど細かく描画を"
+"行います。 既定値 0.0003。"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
@@ -16694,6 +17268,7 @@
 "new server? (Strongly recommended)</html>"
 msgstr ""
-"<html>openstreetbugs プラグインは appspot.com の古いサーバを使用しています。<br>schokokeks.org "
-"の新しいサーバが利用できます。<br>新しいサーバに切り換えますか？ (強く推奨)</html>"
+"<html>openstreetbugs プラグインは appspot.com の古いサーバを使用しています。"
+"<br>schokokeks.org の新しいサーバが利用できます。<br>新しいサーバに切り換えま"
+"すか？ (強く推奨)</html>"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:109
@@ -16706,6 +17281,6 @@
 "upload this data. Maybe you have selected the wrong layer?"
 msgstr ""
-"<html>選択されたデータはOpenStreetBugs "
-"のデータを含んでいます。<br>このデータはアップロードできません。違うレイヤーを選択したようですね？"
+"<html>選択されたデータはOpenStreetBugs のデータを含んでいます。<br>このデータ"
+"はアップロードできません。違うレイヤーを選択したようですね？"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
@@ -16720,7 +17295,8 @@
 
 #: ../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"
-msgstr "ヘッダが複数の値を含んでいるため、一つのストリングに描画することができません。"
+msgid "Header contains several values and cannot be mapped to a single string"
+msgstr ""
+"ヘッダが複数の値を含んでいるため、一つのストリングに描画することができませ"
+"ん。"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
@@ -16745,5 +17321,7 @@
 "The visible area is either too small or too big to download data from "
 "OpenStreetBugs"
-msgstr "表示エリアはOpenStreetBugs からデータをダウンロードするには小さすぎるか大きすぎます"
+msgstr ""
+"表示エリアはOpenStreetBugs からデータをダウンロードするには小さすぎるか大きす"
+"ぎます"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:186
@@ -16789,5 +17367,7 @@
 "<html>Really mark this issue as ''done''?<br><br>You may add an optional "
 "comment:</html>"
-msgstr "<html>この件を本当に''完了''としてマークしますか？<br><br>コメントを追加できます:</html>"
+msgstr ""
+"<html>この件を本当に''完了''としてマークしますか？<br><br>コメントを追加でき"
+"ます:</html>"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
@@ -16829,6 +17409,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 "あなたのキューには保存されていない変更があります。今すぐ登録しますか？"
 
@@ -16864,5 +17443,7 @@
 "Firefox not found. Please set firefox executable in the Map Settings page of "
 "the preferences."
-msgstr "Firefoxが見つかりません。設定のマップ設定ページでfirefoxの実行ファイルの位置を設定してください。"
+msgstr ""
+"Firefoxが見つかりません。設定のマップ設定ページでfirefoxの実行ファイルの位置"
+"を設定してください。"
 
 #: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:149
@@ -16879,6 +17460,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 "次のファイルのexif ヘッダに位置情報を書き込む:"
 
@@ -16931,5 +17511,6 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
-msgstr "<html><h3>イメージのディレクトリに古いバックアップファイルがあります</h3>"
+msgstr ""
+"<html><h3>イメージのディレクトリに古いバックアップファイルがあります</h3>"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
@@ -17186,6 +17767,6 @@
 "talking to the plugin."
 msgstr ""
-"リモコンプラグインは、常にlocalhostの8111番ポートで待ち受けます。プラグインと会話をするほかのアプリケーションが参照するので、ポート番号は変更"
-"できません。"
+"リモコンプラグインは、常にlocalhostの8111番ポートで待ち受けます。プラグインと"
+"会話をするほかのアプリケーションが参照するので、ポート番号は変更できません。"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
@@ -17195,5 +17776,7 @@
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
 msgid "Remote Control has been asked to load data from the API."
-msgstr "APIを通じて、リモートコントロールプラグインによって、データをロードするよう要求されました。"
+msgstr ""
+"APIを通じて、リモートコントロールプラグインによって、データをロードするよう要"
+"求されました。"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
@@ -17220,5 +17803,7 @@
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
 msgid "Remote Control has been asked to import data from the following URL:"
-msgstr "リモートコントロールは以下のURLからデータをインポートするように確認されました。:"
+msgstr ""
+"リモートコントロールは以下のURLからデータをインポートするように確認されまし"
+"た。:"
 
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
@@ -17244,5 +17829,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}"
@@ -17287,5 +17872,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:75
 msgid "Downloading changeset"
-msgstr ""
+msgstr "変更セットをダウンロード中"
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:98
@@ -17293,4 +17878,41 @@
 msgid "Revert changeset #{0}"
 msgstr "変更セット # {0} を元に戻す"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:78
+#, fuzzy
+msgid "Road Sign Plugin"
+msgstr "プラグインのロード"
+
+#: ../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 "タグ付けプリセットのソース {0} を読み込めません。"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
+#, fuzzy, java-format
+msgid "Error parsing tagging preset from ''{0}'':\n"
+msgstr "サイト ''{0}'' からのプラグインリストをパースしています"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:104
+#, fuzzy, java-format
+msgid "Sign {0}"
+msgstr "選択: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:111
+#, fuzzy, java-format
+msgid "Additional sign {0}"
+msgstr "リレーション {0} を追加"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -17397,4 +18019,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 "ウェイの単純化"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
+#, fuzzy
+msgid "Delete unnecessary nodes from an area."
+msgstr "ウェイから不要なノードを削除してください。"
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
 msgid "Slippy Map"
@@ -17608,5 +18241,6 @@
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
-msgstr "タグ付けプリセットテストを開いてタグ付けプリセットダイアログをプレビュー。"
+msgstr ""
+"タグ付けプリセットテストを開いてタグ付けプリセットダイアログをプレビュー。"
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43
@@ -17737,5 +18371,5 @@
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
 msgid "Browse"
-msgstr ""
+msgstr "閲覧"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -17786,5 +18420,7 @@
 "In the following table you can edit the <strong>raw tags</strong> of the OSM "
 "relation representing this turn restriction."
-msgstr "下記表中で、あなたはこの方向転換制限を表わすOSMリレーションの<strong>生のタグ</strong>を編集できます。"
+msgstr ""
+"下記表中で、あなたはこの方向転換制限を表わすOSMリレーションの<strong>生のタグ"
+"</strong>を編集できます。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/AdvancedEditorPanel.java:62
@@ -17792,5 +18428,7 @@
 "In the following table you can edit the <strong>raw members</strong> of the "
 "OSM relation representing this turn restriction."
-msgstr "下記表中で、あなたはこの方向転換制限を表わすOSMリレーションの<strong>生のメンバー</strong>を編集できます。"
+msgstr ""
+"下記表中で、あなたはこの方向転換制限を表わすOSMリレーションの<strong>生のメン"
+"バー</strong>を編集できます。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
@@ -17825,5 +18463,7 @@
 "Cannot add object ''{0}'' as relation member because it is deleted or "
 "invisible in layer ''{1}''"
-msgstr "オブジェクト ''{0}'' をリレーションメンバーとして追加できません。レイヤ ''{1}'' 内で削除済みまたは非表示です"
+msgstr ""
+"オブジェクト ''{0}'' をリレーションメンバーとして追加できません。レイヤ "
+"''{1}'' 内で削除済みまたは非表示です"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:102
@@ -17924,5 +18564,7 @@
 "Updates to this turn restriction can''t be saved unless deleted members are "
 "removed.<br>How to you want to proceed?"
-msgstr "この転回制限への更新は削除済みのメンバーが除去されるまで保存できません。<br>先に進みますか？"
+msgstr ""
+"この転回制限への更新は削除済みのメンバーが除去されるまで保存できません。<br>"
+"先に進みますか？"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:502
@@ -17954,6 +18596,6 @@
 "a conflict and close the editor?</html>"
 msgstr ""
-"<html>この転回制限はエディタの外部で変更されています。<br>変更を適用して編集を続けることはできません。<br><br>競合を作成してエディタを閉"
-"じますか？</html>"
+"<html>この転回制限はエディタの外部で変更されています。<br>変更を適用して編集"
+"を続けることはできません。<br><br>競合を作成してエディタを閉じますか？</html>"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:627
@@ -17963,6 +18605,6 @@
 "resolve this conflict first, then try again.</html>"
 msgstr ""
-"<html>レイヤ ''{0}'' "
-"には既に次のオブジェクトの競合があります<br>''{1}''。<br>最初に競合を解決してからやり直してください。</html>"
+"<html>レイヤ ''{0}'' には既に次のオブジェクトの競合があります<br>''{1}''。"
+"<br>最初に競合を解決してからやり直してください。</html>"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:633
@@ -18151,6 +18793,6 @@
 "data set.</html>"
 msgstr ""
-"<html>選択して現在のセクションのオブジェクトに関連する方向転換制限だけを表示。<br>選択解除して現在のデータセット中の全ての方向転換制限を表示。<"
-"/html>"
+"<html>選択して現在のセクションのオブジェクトに関連する方向転換制限だけを表"
+"示。<br>選択解除して現在のデータセット中の全ての方向転換制限を表示。</html>"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:162
@@ -18189,8 +18831,9 @@
 #: ../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>."
-msgstr ""
-"方向転換プラグインの開発は<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 ""
+"方向転換プラグインの開発は<a href=\"http://www.skobbler.de\">skobbler GmbH</"
+"a>が提供しています。."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:96
@@ -18275,8 +18918,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 ""
 
@@ -18330,8 +18973,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 ""
 
@@ -18354,5 +18997,6 @@
 "A turn restriction must declare the type of restriction. Please select a "
 "type in the Basic Editor."
-msgstr "転回制限には制限種別の宣言が必要です。基本エディタで種別を選択してください。"
+msgstr ""
+"転回制限には制限種別の宣言が必要です。基本エディタで種別を選択してください。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:36
@@ -18416,10 +19060,10 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java:45
 msgid "Add missing tag"
-msgstr ""
+msgstr "欠落したタグを追加"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java:46
 #, java-format
 msgid "Add the missing tag {0}={1}"
-msgstr ""
+msgstr "欠落したタグ {0}={1} を追加"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
@@ -18443,6 +19087,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 ""
 
@@ -18450,6 +19094,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 ""
 
@@ -18573,5 +19217,7 @@
 "An OSM data validator that checks for common errors made by users and editor "
 "programs."
-msgstr "OSM データ妥当性検証はユーザや編集プログラムによる一般的なエラーをチェックします。"
+msgstr ""
+"OSM データ妥当性検証はユーザや編集プログラムによる一般的なエラーをチェックし"
+"ます。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:101
@@ -18729,5 +19375,7 @@
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
-msgstr "このテストでは2つの道路、鉄道、水路あるいは建物が同じレイヤーで交差していてもノードで接続されていないことをチェックします。"
+msgstr ""
+"このテストでは2つの道路、鉄道、水路あるいは建物が同じレイヤーで交差していても"
+"ノードで接続されていないことをチェックします。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:126
@@ -18869,5 +19517,7 @@
 "This test checks that a connection between two nodes is not used by more "
 "than one way."
-msgstr "このテストはふたつのノード間の接続がひとつ以上のウェイで使用されていないかチェックします。"
+msgstr ""
+"このテストはふたつのノード間の接続がひとつ以上のウェイで使用されていないか"
+"チェックします。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:108
@@ -18955,5 +19605,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:200
 msgid "Empty role found"
-msgstr ""
+msgstr "空のロールが見つかりました"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:22
@@ -19099,11 +19749,9 @@
 #: ../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."
-msgstr ""
-"スペルチェックのソース(URL "
-"またはファイル名)(http://wiki.openstreetmap.org/index.php/User:JLS/speller 参照) "
-"またはタグをチェックするデータファイル。"
+"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
+"org/index.php/User:JLS/speller) or tag checking data files."
+msgstr ""
+"スペルチェックのソース(URL またはファイル名)(http://wiki.openstreetmap.org/"
+"index.php/User:JLS/speller 参照) またはタグをチェックするデータファイル。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
@@ -19208,25 +19856,25 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:113
 msgid "More than one \"from\" way found"
-msgstr ""
+msgstr "ひとつ以上の\"from\" ウェイが見つかりました"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:115
 msgid "More than one \"to\" way found"
-msgstr ""
+msgstr "ひとつ以上の\"to\" ウェイが見つかりました"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:117
 msgid "More than one \"via\" way found"
-msgstr ""
+msgstr "ひとつ以上の\"via\" ウェイが見つかりました"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:120
 msgid "No \"from\" way found"
-msgstr ""
+msgstr "\"from\" ウェイが見つかりません"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:124
 msgid "No \"to\" way found"
-msgstr ""
+msgstr "\"to\" ウェイが見つかりません"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:128
 msgid "No \"via\" node or way found"
-msgstr ""
+msgstr "\"via\" ノードまたはウェイが見つかりません"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:138
@@ -19298,9 +19946,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 "領域"
@@ -19316,5 +19964,7 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:62
 msgid "This test checks if a way has an endpoint very near to another way."
-msgstr "このテストはウェイが別のウェイのすぐ近くにエンドポイントを持っているかチェックしています。"
+msgstr ""
+"このテストはウェイが別のウェイのすぐ近くにエンドポイントを持っているかチェッ"
+"クしています。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:127
@@ -19341,5 +19991,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:38
 msgid "This test checks for untagged nodes that are not part of any way."
-msgstr "このテストはどのウェイにも属さないタグ無しのノードをチェックしています。"
+msgstr ""
+"このテストはどのウェイにも属さないタグ無しのノードをチェックしています。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:60
@@ -19349,5 +20000,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:61
 msgid "This test checks for untagged, empty and one node ways."
-msgstr "このテストはタグ無し、空、そして単一ノードのウェイをチェックしています。"
+msgstr ""
+"このテストはタグ無し、空、そして単一ノードのウェイをチェックしています。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
@@ -19396,12 +20048,148 @@
 msgstr "{0}, ..."
 
-#: ../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
+#, fuzzy, java-format
+msgid "{0} {1}% of GPS track"
+msgstr "{1}トラックを含む {0}"
+
+#: ../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 "音声のインポート"
+
+#: ../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 "削除"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
+#, fuzzy
+msgid "removes current video from layer"
+msgstr "レイヤーから写真を削除しますか？"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
+#, fuzzy
+msgid "play/pause"
+msgstr "再生/一時停止"
+
+#: ../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 "背景"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
+#, fuzzy
+msgid "jumps n sec back"
+msgstr "一つ戻る"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "forward"
+msgstr "進む"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "jumps n sec forward"
+msgstr "一つ進む"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
+#, fuzzy
+msgid "faster"
+msgstr "もっと速く"
+
+#: ../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 "遅く"
+
+#: ../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 "現在のGPS位置上にマーカー/ノードの追加を許可"
+
+#. 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
+#, fuzzy
+msgid "Jump length"
+msgstr "そこへジャンプ"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#, fuzzy
+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
+#, fuzzy
+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 "レイヤー"
+
+#: ../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 ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -19453,15 +20241,18 @@
 "an entire way first.</html>"
 msgstr ""
-"\"<html>現在のダウンロードの領域の外に端点のあるノードもウエイも<br>選択されていません。<br>ウエイの始点終点になるノードか、ウエイ全体を先"
-"に選択してください</html>"
+"\"<html>現在のダウンロードの領域の外に端点のあるノードもウエイも<br>選択され"
+"ていません。<br>ウエイの始点終点になるノードか、ウエイ全体を先に選択してくだ"
+"さい</html>"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:107
 msgid "<html>Could not find a unique node to start downloading from.</html>"
-msgstr "<html>ダウンロードを開始するユニークなノードを見つけられませんでした。</html>"
+msgstr ""
+"<html>ダウンロードを開始するユニークなノードを見つけられませんでした。</html>"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:119
 #, java-format
 msgid "<html>There are no ways connected to node ''{0}''. Aborting.</html>"
-msgstr "<html>ノード ''{0}'' に接続されたウェイはありません。異常終了します。</html>"
+msgstr ""
+"<html>ノード ''{0}'' に接続されたウェイはありません。異常終了します。</html>"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:169
@@ -19481,7 +20272,9 @@
 "continue way downloading?</html>"
 msgstr ""
-"<html>これ以上、ダウンロードすべき接続されたウエイがありません。<br>しかし、現在選択されているノードと重複していそうなものが見つかりました。<b"
-"r><br>現在選択されているノードは、\"{0}\"です。<br>重複していそうなノードは\"{1}\"です。<br>重複したノードを現在選択したノード"
-"に混合してウエイのダウンロードを継続しますか？</html>"
+"<html>これ以上、ダウンロードすべき接続されたウエイがありません。<br>しかし、"
+"現在選択されているノードと重複していそうなものが見つかりました。<br><br>現在"
+"選択されているノードは、\"{0}\"です。<br>重複していそうなノードは\"{1}\"で"
+"す。<br>重複したノードを現在選択したノードに混合してウエイのダウンロードを継"
+"続しますか？</html>"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:196
@@ -19558,5 +20351,7 @@
 "Couldn't match the entered link or id to the selected service. Please try "
 "again."
-msgstr "入力されたリンクまたはID を選択されたサービスにマッチさせることができませんでした。もう一度試してください。"
+msgstr ""
+"入力されたリンクまたはID を選択されたサービスにマッチさせることができませんで"
+"した。もう一度試してください。"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:202
@@ -19598,5 +20393,7 @@
 "Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing '&' "
 "or a trailing '?'."
-msgstr "警告: WMS サービス用のベースURL ''{0}'' には末尾の '&' または '?' がありません。"
+msgstr ""
+"警告: WMS サービス用のベースURL ''{0}'' には末尾の '&' または '?' がありませ"
+"ん。"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
@@ -19620,28 +20417,28 @@
 "間違った座標にたどりつく可能性があります。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
 msgid "Automatic downloading"
 msgstr "自動ダウンロード"
 
-#: ../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 "警告: WMS レイヤーは不正なベースURL ''{0}'' のために無効化されました"
 
-#: ../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 "WMS レイヤー ({0}), 自動的に倍率 {1} でダウンロード"
 
-#: ../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 "WMS レイヤー ({0}), 自倍率 {1} でダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
 #, java-format
 msgid ""
@@ -19652,116 +20449,117 @@
 msgstr ""
 "<html>このWMS レイヤー用のベースURL<br>''{0}''<br>の終わりに ''&'' や ''?'' "
-"を付けてはなりません。<br>そうすると不正なWMSリクエストとなる場合があります。設定を<br>チェックしてください。<br>強制的にWMS "
-"タイルを取得しますか？"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
+"を付けてはなりません。<br>そうすると不正なWMSリクエストとなる場合があります。"
+"設定を<br>チェックしてください。<br>強制的にWMS タイルを取得しますか？"
+
+#: ../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 "不正なURL？"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311
 msgid "Download visible tiles"
 msgstr "見えるタイルのダウンロード"
 
-#: ../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
+msgstr ""
+"要求された範囲は大きすぎます。もう少し拡大するか、解像度を変更してください。"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329
 msgid "Change resolution"
 msgstr "解像度の変更"
 
-#: ../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 "WMSレイヤーをファイルに保存"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
 msgid "Save WMS layer"
 msgstr "WMS レイヤーを保存"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413
 msgid "Load WMS layer from file"
 msgstr "WMSレイヤーをファイルから読み込む"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
 msgid "Load WMS layer"
 msgstr "WMS レイヤーをロード"
 
-#: ../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 "未サポートの WMSファイルのバージョン; 発見 {0}, 予想 {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 "WMSブックマークをセット"
 
-#: ../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 "ファイルからデータをロードするためのブランクWMSレイヤーを開く"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
 msgid "WMS Plugin Preferences"
 msgstr "WMSプラグイン設定"
 
-#: ../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 "WMSプラグインメニューに表示されるWMS サーバのリストを変更"
 
-#: ../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 "メニューの名前"
 
-#: ../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 "WMS URL"
 
-#: ../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 "WMS URL (既定)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:86
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
 msgid "Enter a menu name and WMS URL"
 msgstr "メニュー名とWMS URLを入力"
 
-#: ../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 "ダウンローダ:"
@@ -19778,4 +20576,9 @@
 msgid "% of north:"
 msgstr "北の %"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186
+#, fuzzy
+msgid "Simultaneous connections"
+msgstr "ノード: 接続"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -19787,7 +20590,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
@@ -19796,5 +20599,6 @@
 "area, or use planet.osm"
 msgstr ""
-"あまりにたくさんのノードを要求しました（制限は50,000です)。 より小さなエリアで要求し直すか、planet.osmを使用してください。"
+"あまりにたくさんのノードを要求しました（制限は50,000です)。 より小さなエリア"
+"で要求し直すか、planet.osmを使用してください。"
 
 #. OSM server message
@@ -19808,5 +20612,7 @@
 "The maximum bbox size is 0.25, and your request was too large. Either "
 "request a smaller area, or use planet.osm"
-msgstr "bbox の最大は 0.25です。要求された範囲は大きすぎます。より小さい範囲を要求するか、planet.osm を使用して下さい。"
+msgstr ""
+"bbox の最大は 0.25です。要求された範囲は大きすぎます。より小さい範囲を要求す"
+"るか、planet.osm を使用して下さい。"
 
 #. Java message loading audio data
@@ -19823,5 +20629,6 @@
 #: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
-msgstr "新しいデータをアップロードするには編集をパブリックにしなければなりません"
+msgstr ""
+"新しいデータをアップロードするには編集をパブリックにしなければなりません"
 
 #. Nominatim search place type
@@ -19836,8 +20643,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 "森"
@@ -19854,7 +20661,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--boundary tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -19864,5 +20671,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -19905,5 +20712,5 @@
 #. color boundary
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -19913,5 +20720,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -19921,5 +20728,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -19929,15 +20736,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 "行政区境"
@@ -19946,5 +20753,5 @@
 #: build/specialmessages.java:18
 msgid "multipolygon"
-msgstr ""
+msgstr "マルチポリゴン"
 
 #. relation type
@@ -19953,5 +20760,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -19960,7 +20767,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--route tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -19970,5 +20777,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -19978,5 +20785,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -19986,5 +20793,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -19994,5 +20801,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -20002,5 +20809,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -20010,5 +20817,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -20018,12 +20825,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 "ルート"
@@ -20032,5 +20839,5 @@
 #: build/specialmessages.java:21
 msgid "All Files"
-msgstr ""
+msgstr "全てのファイル"
 
 #. Strings in JFileChooser
@@ -20052,20 +20859,20 @@
 #: build/specialmessages.java:26
 msgid "Delete File"
-msgstr ""
+msgstr "ファイルを削除"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:28
 msgid "Enter file name:"
-msgstr ""
+msgstr "ファイル名を入力:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:29
 msgid "Enter path or folder name:"
-msgstr ""
+msgstr "パスまたはフォルダ名を入力:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:30
 msgid "Error "
-msgstr ""
+msgstr "エラー "
 
 #. Strings in JFileChooser
@@ -20083,5 +20890,5 @@
 #: build/specialmessages.java:33
 msgid "File Name:"
-msgstr ""
+msgstr "ファイル名："
 
 #. Strings in JFileChooser
@@ -20093,5 +20900,5 @@
 #: build/specialmessages.java:35
 msgid "Files"
-msgstr ""
+msgstr "ファイル"
 
 #. Strings in JFileChooser
@@ -20108,10 +20915,10 @@
 #: build/specialmessages.java:39
 msgid "Filter:"
-msgstr ""
+msgstr "フィルタ:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:40
 msgid "Folders"
-msgstr ""
+msgstr "フォルダ"
 
 #. Strings in JFileChooser
@@ -20128,10 +20935,10 @@
 #: build/specialmessages.java:44
 msgid "Look in:"
-msgstr ""
+msgstr "検索対象:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:45
 msgid "Look In:"
-msgstr ""
+msgstr "検索対象:"
 
 #. Strings in JFileChooser
@@ -20148,5 +20955,5 @@
 #: build/specialmessages.java:51
 msgid "Open selected file."
-msgstr ""
+msgstr "選択したファイルを開く。"
 
 #. Strings in JFileChooser
@@ -20263,6 +21070,8 @@
 "true :-)"
 msgstr ""
-"ユーザは異なる色スキームを作成し、切り替えることができます。色を変えて新しいスキームを作成してください。明るい自然光の中で視認性を上げるには一致する色の白"
-"い背景に切り替えるのに使われます。JOSMの設定にあるダイアログと ''Map Settings'' を参照してください(奇妙ですが本当です :-)"
+"ユーザは異なる色スキームを作成し、切り替えることができます。色を変えて新しい"
+"スキームを作成してください。明るい自然光の中で視認性を上げるには一致する色の"
+"白い背景に切り替えるのに使われます。JOSMの設定にあるダイアログと ''Map "
+"Settings'' を参照してください(奇妙ですが本当です :-)"
 
 #. Plugin Create_grid_of_ways
@@ -20275,10 +21084,12 @@
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
-msgstr "チェコ共和国内のアドレスノードと建物を作成、編集するためのプラグインです。"
+msgstr ""
+"チェコ共和国内のアドレスノードと建物を作成、編集するためのプラグインです。"
 
 #. Plugin dataimport
 #: build/trans_plugins.java:16
 msgid "Allows to import various file formats into JOSM directly."
-msgstr "様々なフォーマットのファイルを JOSM に直接インポートできるようにします。"
+msgstr ""
+"様々なフォーマットのファイルを JOSM に直接インポートできるようにします。"
 
 #. Plugin DirectUpload
@@ -20287,5 +21098,7 @@
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
 "openstreetmap.org."
-msgstr "このプラグインは現在アクティブなJOSMレイヤーのGPSトラックをopenstreetmap.orgへ直接アップロードします。"
+msgstr ""
+"このプラグインは現在アクティブなJOSMレイヤーのGPSトラックをopenstreetmap.org"
+"へ直接アップロードします。"
 
 #. Plugin Duplicate-Way
@@ -20299,24 +21112,25 @@
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
-msgstr "ユーザにタイムスタンプの匿名化と広大なGPX トラックの部分的な高速削除を許可する。"
+msgstr ""
+"ユーザにタイムスタンプの匿名化と広大なGPX トラックの部分的な高速削除を許可す"
+"る。"
 
 #. 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 "GlobalSat DG-100データロガーからJOSMに直接GPSポイントをダウンロード"
 
 #. 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 "
@@ -20324,14 +21138,15 @@
 "the filename of an image."
 msgstr ""
-"画像をGPX ファイル内のウェイポイントと照合する別のプラグイン。照合はウェイポイントタグの ''name'', ''cmt'' または "
-"''desc'' 属性が画像のファイル名と一致したときに行われます。"
+"画像をGPX ファイル内のウェイポイントと照合する別のプラグイン。照合はウェイポ"
+"イントタグの ''name'', ''cmt'' または ''desc'' 属性が画像のファイル名と一致し"
+"たときに行われます。"
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:34
 msgid "Helps vectorizing WMS images."
 msgstr "WMS イメージのベクトル化を支援する"
 
 #. 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."
@@ -20339,30 +21154,34 @@
 
 #. 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 "
 "segments, area surrounded by a (simple) closed way and create measurement "
 "paths (which also can be imported from a gps layer)."
-msgstr "選択したパスの長さ、角度、簡単な領域内の面積を表示するダイアログとレイヤーを追加します。"
+msgstr ""
+"選択したパスの長さ、角度、簡単な領域内の面積を表示するダイアログとレイヤーを"
+"追加します。"
 
 #. 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 "4 または5のウェイのセットに左折禁止を追加"
 
 #. 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 "
 "relation editor."
-msgstr "マルチポリゴンをワンクリックで作成し、リレーションエディタによる通常のやり方よりはるかに簡単です。"
+msgstr ""
+"マルチポリゴンをワンクリックで作成し、リレーションエディタによる通常のやり方"
+"よりはるかに簡単です。"
 
 #. 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 "
@@ -20370,19 +21189,22 @@
 "mouse moving (general Java - tablet problem)."
 msgstr ""
-"小さく短いドラッッグ時にクリックとみなします。これはタブレットペンを使用していて、マウス動作なしでタブレットをクリックするのに問題がある時に役に立ちます。"
-"（一般的な Java - タブレット問題）"
+"小さく短いドラッッグ時にクリックとみなします。これはタブレットペンを使用して"
+"いて、マウス動作なしでタブレットをクリックするのに問題がある時に役に立ちま"
+"す。（一般的な Java - タブレット問題）"
 
 #. Plugin openlayers
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:48
 msgid "Displays an OpenLayers background image"
 msgstr "OpenLayers の背景画面を表示"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:50
 msgid "Imports issues from OpenStreetBugs"
-msgstr "OpenStreetBugs のバグ情報を読んだり、新たにバグを報告したりできるようにします。"
+msgstr ""
+"OpenStreetBugs のバグ情報を読んだり、新たにバグを報告したりできるようにしま"
+"す。"
 
 #. 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"
@@ -20390,30 +21212,36 @@
 
 #. 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."
-msgstr "現在表示されているスクリーンを、きれいなSVG画像として表示されるように、Firefoxを起動する。"
+msgstr ""
+"現在表示されているスクリーンを、きれいなSVG画像として表示されるように、"
+"Firefoxを起動する。"
 
 #. 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 "
 "right click menu of the image layer."
-msgstr "GPS位置情報を画像ファイルヘッダに書き込みます。このフィーチャは画像レイヤの右クリックメニューから起動します。"
+msgstr ""
+"GPS位置情報を画像ファイルヘッダに書き込みます。このフィーチャは画像レイヤの右"
+"クリックメニューから起動します。"
 
 #. 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 "
 "align it with the map."
-msgstr "このプラグインでは編集画面の背景として任意の画像を表示し、地図と並べることができます。"
+msgstr ""
+"このプラグインでは編集画面の背景として任意の画像を表示し、地図と並べることが"
+"できます。"
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "偉大なJGoodies のプラスティック風のルック＆フィール。"
 
 #. 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."
@@ -20421,46 +21249,57 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "Let other applications send commands to JOSM."
 msgstr "他のアプリーケーションにJOSM へのコマンドを送信させる"
 
 #. 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 "
 "defined in routes.xml file in plugin directory"
 msgstr ""
-"ルートを描画（公共バス、ハイキングコース、サイクリングコース、..）。ルートのタイプはplugin ディレクトリのroute.xml "
-"ファイルに定義されていなければなりません"
+"ルートを描画（公共バス、ハイキングコース、サイクリングコース、..）。ルートの"
+"タイプはplugin ディレクトリのroute.xml ファイルに定義されていなければなりませ"
+"ん"
 
 #. 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 "
 "background and request updates."
-msgstr "JOSM のスリッピーマップグリッドを表示。スリッピーマップからタイルを背景としてロードし、更新を要求できます。"
+msgstr ""
+"JOSM のスリッピーマップグリッドを表示。スリッピーマップからタイルを背景として"
+"ロードし、更新を要求できます。"
 
 #. Plugin surveyor
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:77
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "現在のGPS位置上にマーカー/ノードの追加を許可"
 
 #. 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 "
@@ -20468,14 +21307,15 @@
 "the jar-file as standalone as well."
 msgstr ""
-"ヘルプメニューにタグ付けプリセットテスターを追加します。これはタグ付けプリセットの手助けになります(ポップアップダイアログによるクイックレビュー)。jar"
-" ファイルも同様にスタンドアロンとして起動できます。"
+"ヘルプメニューにタグ付けプリセットテスターを追加します。これはタグ付けプリ"
+"セットの手助けになります(ポップアップダイアログによるクイックレビュー)。jar "
+"ファイルも同様にスタンドアロンとして起動できます。"
 
 #. Plugin terracer
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:83
 msgid "Make terraced houses out of single blocks."
 msgstr "1つのブロックからテラスハウスを作成する"
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:85
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -20484,5 +21324,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) "
@@ -20491,5 +21331,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:89
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20498,17 +21338,19 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:91
 msgid "Allows undeleting object from OSM database"
 msgstr "OSMデータベースからの削除取消を許可"
 
 #. 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 "
 "for the common ones. Spellcheck integrated for tag names."
-msgstr "OSM データ妥当性検証。データ中の問題をチェックし、一般的な解決法を提供します。タグ名用にスペルチェック機能が統合されています。"
+msgstr ""
+"OSM データ妥当性検証。データ中の問題をチェックし、一般的な解決法を提供しま"
+"す。タグ名用にスペルチェック機能が統合されています。"
 
 #. Plugin videomapping
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:95
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20518,24 +21360,24 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:97
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
 "plugin is still under early development and may be buggy."
 msgstr ""
-"walking-papers.org "
-"からスキャンされた地図のタイルのダウンロードをサポートします。まだ開発初期段階ですので、バグを含んでいるかもしれません。"
+"walking-papers.org からスキャンされた地図のタイルのダウンロードをサポートしま"
+"す。まだ開発初期段階ですので、バグを含んでいるかもしれません。"
 
 #. 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 "
@@ -20544,5 +21386,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:105
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21432,10 +22274,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 "ロータリー交差点"
@@ -21572,8 +22414,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"/>
@@ -21783,5 +22625,5 @@
 #. color motorroad
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21791,5 +22633,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21808,5 +22650,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21816,5 +22658,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21833,5 +22675,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -21841,5 +22683,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -21858,5 +22700,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -21866,5 +22708,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -21879,5 +22721,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -21895,8 +22737,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 "居住区域内道路"
@@ -21911,5 +22753,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -21918,5 +22760,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--public_transport tags -->
 #. <rule>
@@ -21926,10 +22768,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 "敷地内道路"
@@ -21944,5 +22786,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -21951,5 +22793,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -21959,10 +22801,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 "工事中"
@@ -22971,9 +23813,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 "沼地、湿地"
@@ -23303,5 +24145,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -23311,5 +24153,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -23319,5 +24161,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -23327,5 +24169,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -23335,5 +24177,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -23343,5 +24185,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -23351,5 +24193,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -23360,5 +24202,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -23366,9 +24208,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 "線路"
@@ -24778,5 +25620,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24786,5 +25628,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24794,5 +25636,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24802,5 +25644,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -25164,7 +26006,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--sport tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -25174,5 +26016,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -25182,5 +26024,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -25190,5 +26032,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -25198,5 +26040,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -25206,5 +26048,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -25214,5 +26056,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -25222,5 +26064,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -25230,5 +26072,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -25238,5 +26080,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -25246,5 +26088,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -25254,5 +26096,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -25262,5 +26104,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -25270,5 +26112,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -25278,5 +26120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -25286,5 +26128,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -25294,5 +26136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -25302,5 +26144,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -25310,5 +26152,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -25318,5 +26160,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -25326,5 +26168,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -25334,5 +26176,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -25342,5 +26184,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -25350,5 +26192,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -25358,5 +26200,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -25366,5 +26208,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -25374,5 +26216,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -25382,5 +26224,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -25390,5 +26232,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -25398,5 +26240,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -25406,5 +26248,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -25414,5 +26256,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -25422,5 +26264,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -25430,5 +26272,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -25438,5 +26280,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -25446,5 +26288,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -25454,5 +26296,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -25462,5 +26304,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -25470,5 +26312,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -25478,5 +26320,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -25486,5 +26328,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -25494,5 +26336,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -25502,5 +26344,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -25510,5 +26352,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -25518,5 +26360,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -25526,5 +26368,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -25534,33 +26376,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 "スポーツ"
@@ -27239,7 +28081,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--landuse tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -27249,5 +28091,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -27257,5 +28099,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -27265,5 +28107,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -27273,5 +28115,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -27281,5 +28123,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -27289,5 +28131,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -27297,5 +28139,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -27305,12 +28147,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 "緑"
@@ -28726,5 +29568,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -28740,5 +29582,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28748,18 +29590,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 -->
@@ -28768,7 +29627,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- cycleway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28778,5 +29637,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28786,5 +29645,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28794,5 +29653,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28802,12 +29661,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 "自転車"
@@ -28834,5 +29694,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -28848,5 +29708,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -28856,5 +29716,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28863,13 +29723,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"/>
@@ -28880,11 +29748,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 "徒歩"
@@ -28903,8 +29772,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 "地下鉄"
@@ -29016,9 +29885,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
@@ -29026,5 +29895,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,
@@ -29034,8 +29903,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
@@ -29049,5 +29918,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#. 
+#.
 #: build/trans_style.java:72
 msgid "standard"
@@ -29055,5 +29924,5 @@
 
 #. mappaint style named "standard"
-#. 
+#.
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -29102,6 +29971,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>
@@ -29181,5 +30050,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -29189,16 +30058,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 "破棄された"
@@ -29209,5 +30078,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -29216,5 +30085,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -29223,5 +30092,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -29237,5 +30106,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -29249,5 +30118,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -29256,5 +30125,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -29263,5 +30132,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -29270,5 +30139,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -29277,5 +30146,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -29284,5 +30153,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -29291,5 +30160,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxweight"/>
@@ -29298,5 +30167,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxheight"/>
@@ -29305,5 +30174,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -29312,5 +30181,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxlength"/>
@@ -29319,5 +30188,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -29326,5 +30195,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="minspeed"/>
@@ -29333,5 +30202,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxstay"/>
@@ -29340,5 +30209,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="toll"/>
@@ -29347,5 +30216,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="barrier"/>
@@ -29522,7 +30391,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- highway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -29536,5 +30405,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -29544,7 +30413,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- tracktype tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -29554,5 +30423,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -29562,5 +30431,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -29570,5 +30439,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -29578,10 +30447,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 "車線"
@@ -29592,5 +30461,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -29599,5 +30468,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -29607,5 +30476,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -29614,5 +30483,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -29621,5 +30490,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -29628,5 +30497,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -29635,5 +30504,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -29642,5 +30511,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -29649,5 +30518,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -29656,5 +30525,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -29663,5 +30532,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -29670,8 +30539,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 "敷地内道路"
@@ -29682,8 +30551,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 "浅瀬（洗い越し）"
@@ -29694,5 +30563,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -29701,8 +30570,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 "転回所"
@@ -29713,9 +30582,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 "緊急アクセスポイント"
@@ -29726,9 +30595,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 "川岸"
@@ -29739,8 +30608,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 "小川"
@@ -29751,8 +30620,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 "ドック"
@@ -29763,5 +30632,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29770,5 +30639,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29777,5 +30646,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29785,5 +30654,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29792,5 +30661,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29799,5 +30668,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29806,5 +30675,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29814,5 +30683,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29823,5 +30692,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -29831,7 +30700,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--man_made tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -29841,5 +30710,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -29849,5 +30718,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -29857,5 +30726,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -29866,5 +30735,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -29873,5 +30742,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -29881,5 +30750,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -29889,5 +30758,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -29897,5 +30766,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -29905,5 +30774,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -29913,5 +30782,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -29921,5 +30790,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -29929,5 +30798,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -29937,5 +30806,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -29945,18 +30814,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 "人工物"
@@ -29966,9 +30835,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 "rapids"
@@ -29979,7 +30848,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- railway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -29989,5 +30858,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -29996,5 +30865,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -30004,5 +30873,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -30011,5 +30880,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -30019,5 +30888,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -30027,10 +30896,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 "鉄道ポイント"
@@ -30041,5 +30910,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -30050,13 +30919,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 "高架鉄道"
@@ -30067,5 +30936,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -30075,5 +30944,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30086,5 +30955,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30092,7 +30961,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 "古い軌道"
@@ -30103,5 +30972,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -30110,5 +30979,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -30117,5 +30986,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -30124,7 +30993,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aeroway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -30135,9 +31004,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 "空路"
@@ -30148,8 +31017,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 "駅"
@@ -30160,5 +31029,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -30168,8 +31037,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 "空路（暗色）"
@@ -30180,8 +31049,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 "空路（明色）"
@@ -30192,5 +31061,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -30199,5 +31068,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -30206,7 +31075,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aerialway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -30216,5 +31085,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -30224,5 +31093,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -30232,5 +31101,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -30240,5 +31109,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -30248,10 +31117,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 "リフト"
@@ -30262,11 +31131,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 "初球者スキーコース"
@@ -30277,9 +31146,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 "中級者スキーコース"
@@ -30290,9 +31159,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 "上級者スキーコース"
@@ -30303,9 +31172,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 "熟練者用のゲレンデ"
@@ -30316,9 +31185,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 "フリースタイルのゲレンデ"
@@ -30329,9 +31198,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 "初心者スキーゲレンデ"
@@ -30342,7 +31211,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--power tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -30352,5 +31221,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -30359,5 +31228,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -30367,5 +31236,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -30375,5 +31244,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -30383,5 +31252,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -30391,5 +31260,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -30399,5 +31268,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -30407,5 +31276,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -30415,5 +31284,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -30423,5 +31292,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -30431,5 +31300,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -30439,5 +31308,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -30447,15 +31316,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 "電力"
@@ -30465,9 +31334,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 "桟橋"
@@ -30478,8 +31347,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 "パイプライン"
@@ -30489,7 +31358,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--leisure tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -30499,5 +31368,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -30507,5 +31376,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -30515,5 +31384,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -30523,5 +31392,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -30531,5 +31400,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -30539,5 +31408,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -30547,5 +31416,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -30555,5 +31424,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -30563,5 +31432,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -30571,5 +31440,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -30579,5 +31448,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -30587,5 +31456,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -30595,5 +31464,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -30603,5 +31472,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -30611,5 +31480,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -30619,17 +31488,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 "レジャー"
@@ -30639,9 +31508,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 "マリーナ"
@@ -30651,7 +31520,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--amenity tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -30661,5 +31530,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -30669,5 +31538,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -30677,5 +31546,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -30685,5 +31554,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -30693,5 +31562,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -30701,5 +31570,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -30709,5 +31578,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -30717,5 +31586,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -30725,5 +31594,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -30733,14 +31602,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 "アメニティ"
@@ -30750,5 +31619,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30758,5 +31627,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30766,5 +31635,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30774,5 +31643,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30782,5 +31651,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30790,5 +31659,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30798,5 +31667,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30806,5 +31675,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30814,5 +31683,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30822,5 +31691,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -30830,5 +31699,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -30838,14 +31707,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 "アメニティ_交通"
@@ -30855,5 +31724,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -30862,5 +31731,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -30870,5 +31739,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -30877,5 +31746,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -30885,5 +31754,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -30893,5 +31762,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -30901,5 +31770,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -30908,5 +31777,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -30916,5 +31785,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -30924,5 +31793,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -30932,5 +31801,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -30940,5 +31809,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -30947,5 +31816,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -30954,5 +31823,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -30961,5 +31830,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -30968,5 +31837,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -30975,5 +31844,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -30982,5 +31851,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -30989,5 +31858,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -30996,5 +31865,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -31003,5 +31872,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -31010,5 +31879,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -31017,5 +31886,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -31024,5 +31893,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -31031,5 +31900,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -31039,5 +31908,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -31047,5 +31916,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -31055,5 +31924,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -31063,5 +31932,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -31071,5 +31940,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -31079,5 +31948,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -31087,5 +31956,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -31095,5 +31964,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -31103,5 +31972,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -31112,5 +31981,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -31120,5 +31989,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -31128,5 +31997,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -31136,5 +32005,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -31144,5 +32013,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -31152,5 +32021,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -31160,5 +32029,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -31168,5 +32037,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -31176,5 +32045,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -31184,5 +32053,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -31192,5 +32061,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -31200,5 +32069,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -31208,5 +32077,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -31216,5 +32085,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -31224,5 +32093,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -31232,5 +32101,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"/>
@@ -31240,5 +32117,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -31248,5 +32125,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -31256,5 +32133,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -31264,5 +32141,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -31271,27 +32148,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 "アメニティ_信号"
@@ -31301,5 +32179,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -31309,5 +32187,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -31317,12 +32195,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 "信号_水域"
@@ -31332,5 +32210,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -31340,5 +32218,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -31348,5 +32226,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -31356,5 +32234,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -31364,5 +32242,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -31372,5 +32250,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -31380,11 +32258,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 "健康"
@@ -31394,7 +32272,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--shop tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -31404,5 +32282,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -31412,5 +32290,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -31420,5 +32298,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -31428,5 +32306,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -31436,5 +32314,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -31444,5 +32322,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -31452,5 +32330,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -31460,5 +32338,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -31468,5 +32346,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -31476,5 +32354,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -31484,5 +32362,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -31492,5 +32370,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -31500,5 +32378,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -31508,5 +32386,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -31516,5 +32394,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -31524,5 +32402,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -31532,5 +32410,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -31540,5 +32418,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -31548,5 +32426,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -31556,5 +32434,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -31564,5 +32442,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -31572,5 +32450,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -31580,5 +32458,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -31588,5 +32466,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -31596,5 +32474,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -31604,5 +32482,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -31612,5 +32490,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -31620,5 +32498,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -31628,5 +32506,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -31636,5 +32514,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -31644,5 +32522,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -31652,5 +32530,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -31660,5 +32538,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -31668,5 +32546,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -31676,5 +32554,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -31684,5 +32562,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -31692,5 +32570,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -31700,5 +32578,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -31708,5 +32586,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -31716,5 +32594,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -31724,5 +32602,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -31732,31 +32610,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 "店"
@@ -31766,7 +32644,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--tourism tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31776,5 +32654,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31784,5 +32662,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31792,5 +32670,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31800,5 +32678,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31808,5 +32686,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31816,5 +32694,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31824,12 +32702,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 "ホテル"
@@ -31839,5 +32717,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -31847,5 +32725,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -31855,5 +32733,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -31863,5 +32741,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -31871,5 +32749,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -31879,5 +32757,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -31888,5 +32766,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -31896,5 +32774,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- information tags -->
 #. <rule>
@@ -31904,5 +32782,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -31912,5 +32790,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -31919,5 +32797,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -31926,13 +32804,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 "旅行関係"
@@ -31942,7 +32820,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--historic tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -31952,5 +32830,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -31960,5 +32838,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -31968,5 +32846,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -31976,5 +32854,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -31984,5 +32862,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -31992,5 +32870,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -32000,5 +32878,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -32008,5 +32886,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -32016,13 +32894,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 "史跡"
@@ -32032,8 +32910,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 "石切り場"
@@ -32044,8 +32922,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 "埋め立て地"
@@ -32056,5 +32934,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -32064,8 +32942,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 "水たまり、窪地"
@@ -32076,8 +32954,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 "農家の庭"
@@ -32088,6 +32966,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
-#. 
+#.
+#.
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -32097,8 +32975,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 "小売りの商用地"
@@ -32109,8 +32987,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 "工業地"
@@ -32121,8 +32999,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 "使用していない工業地"
@@ -32133,8 +33011,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 "緑地"
@@ -32145,8 +33023,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 "鉄道公園"
@@ -32157,5 +33035,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -32165,7 +33043,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--military tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -32175,5 +33053,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -32183,5 +33061,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -32191,5 +33069,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -32199,11 +33077,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 "軍用地"
@@ -32214,8 +33092,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 "共同墓地"
@@ -32225,8 +33103,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 "山頂"
@@ -32237,9 +33115,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 "氷河"
@@ -32249,9 +33127,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 "火山"
@@ -32261,5 +33139,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -32270,5 +33148,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -32278,5 +33156,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -32286,5 +33164,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -32294,5 +33172,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -32302,12 +33180,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 "自然"
@@ -32317,9 +33195,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 "低木"
@@ -32329,9 +33207,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 "荒地"
@@ -32341,9 +33219,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 "森林エリア"
@@ -32353,9 +33231,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 "泥"
@@ -32365,9 +33243,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 "砂浜"
@@ -32378,5 +33256,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?
@@ -32402,5 +33280,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -32411,11 +33289,11 @@
 #. </rule>
 #. -->
-#. 
+#.
 #. <!--name tags -->
-#. 
+#.
 #. <!--preferences tags -->
-#. 
+#.
 #. <!--place tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -32425,5 +33303,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -32433,5 +33311,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -32441,5 +33319,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -32449,5 +33327,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -32457,5 +33335,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -32465,5 +33343,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -32473,5 +33351,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -32481,5 +33359,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -32489,5 +33367,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -32497,5 +33375,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -32505,5 +33383,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -32513,15 +33391,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 "場所"
@@ -32531,9 +33409,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 "tiger_data"
@@ -32624,5 +33502,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#. 
+#.
 #. Data type can be:
 #. node        - a node point
@@ -32630,28 +33508,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
@@ -32766,5 +33644,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#. 
+#.
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32777,5 +33655,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>
@@ -32800,6 +33678,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#. 
-#. 
+#.
+#.
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32808,6 +33686,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#. 
-#. 
+#.
+#.
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32822,6 +33700,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
@@ -32835,6 +33713,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
@@ -32854,6 +33732,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#. 
-#. 
+#.
+#.
 #. only for Japan
 #: build/trans_wms.java:39
@@ -32877,6 +33755,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
@@ -32889,4 +33767,13 @@
 msgstr "Sicily - Italy"
 
+#~ 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 ""
+#~ "ソースオブジェクトが古いバージョン{2}が不可視であっても、対象となるid {0}"
+#~ "でバージョン{1}のオブジェクトは可視になります。この一貫性の矛盾を扱うこと"
+#~ "はできません。対象オブジェクトを維持します。 "
+
 #~ msgid "Move"
 #~ msgstr "移動"
@@ -32961,5 +33848,4 @@
 #~ msgstr "JOSMオンラインヘルプ"
 
-#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -32971,15 +33857,15 @@
 #~ "{0}"
 
-#, java-format
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
 #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "プラグイン{0}のアップデートに成功しました。JOSMを再起動してください。"
-
-#, java-format
+#~ msgstr[0] ""
+#~ "プラグイン{0}のアップデートに成功しました。JOSMを再起動してください。"
+
 #~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded automatically."
-#~ msgstr "プラグイン {0}が壊れているか、自動的にダウンロードできないようです。"
-
-#, java-format
+#~ "The plugin {0} seems to be broken or could not be downloaded "
+#~ "automatically."
+#~ msgstr ""
+#~ "プラグイン {0}が壊れているか、自動的にダウンロードできないようです。"
+
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "{1}からプラグイン: {0}をダウンロードできません"
@@ -32988,16 +33874,16 @@
 #~ msgstr "正しくないパスワードかユーザ名です。"
 
-#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "プラグインが見つかりません： {0}"
 
-#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "プラグインはJPSMのアップデートを要求しています: {0}"
 
 #~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before reporting "
-#~ "a bug."
-#~ msgstr "バグの報告前にJOSMの最新バージョンとすべてのプラグインのアップデートをしてください。"
+#~ "Try updating to the newest version of JOSM and all plugins before "
+#~ "reporting a bug."
+#~ msgstr ""
+#~ "バグの報告前にJOSMの最新バージョンとすべてのプラグインのアップデートをして"
+#~ "ください。"
 
 #~ msgid "Include your steps to get to the error (as detailed as possible)!"
@@ -33013,10 +33899,11 @@
 #~ "Server returned internal error. Try a reduced area or retry after waiting "
 #~ "some time."
-#~ msgstr "サーバが内部エラーを返しました。しばらく待ってから試すか、領域指定を縮小して試してください。"
+#~ msgstr ""
+#~ "サーバが内部エラーを返しました。しばらく待ってから試すか、領域指定を縮小し"
+#~ "て試してください。"
 
 #~ msgid "Found <member> element in non-relation."
 #~ msgstr "<member>要素がリレーション以外に見つかりました"
 
-#, java-format
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr "存在しないノードを含むため、ウエイ {0} をスキップします\n"
@@ -33029,5 +33916,7 @@
 
 #~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr "ヒント：変更の一部は、新しいデータをサーバにアップロードすることで現れます。"
+#~ msgstr ""
+#~ "ヒント：変更の一部は、新しいデータをサーバにアップロードすることで現れま"
+#~ "す。"
 
 #~ msgid "Please enter a search string"
@@ -33043,5 +33932,4 @@
 #~ msgstr "ズーム"
 
-#, java-format
 #~ msgid "Layers: {0}"
 #~ msgstr "レイヤー：{0}"
@@ -33062,9 +33950,7 @@
 #~ msgstr "OSMサーバに接続…"
 
-#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "作者: {0}"
 
-#, java-format
 #~ msgid "Images for {0}"
 #~ msgstr "{0} のイメージ"
@@ -33073,9 +33959,7 @@
 #~ msgstr "GPXの読み込み…"
 
-#, java-format
 #~ msgid "No time for point {0} x {1}"
 #~ msgstr "地点 {0} x {1}に時刻がありません"
 
-#, java-format
 #~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
 #~ msgstr "時刻 \"{0}\"を地点 {1}×{2} から読み取ることができませんでした"
@@ -33084,13 +33968,10 @@
 #~ msgstr "読み取り可能な時刻のついた画像が見つかりませんでした。"
 
-#, java-format
 #~ msgid "GPS start: {0}"
 #~ msgstr "GPS開始: {0}"
 
-#, java-format
 #~ msgid "GPS end: {0}"
 #~ msgstr "GPS終了: {0}"
 
-#, java-format
 #~ msgid "current delta: {0}s"
 #~ msgstr "現在の差分: {0} 秒"
@@ -33100,5 +33981,4 @@
 #~ msgstr[0] "画像"
 
-#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "トラック内に {0}"
@@ -33150,5 +34030,4 @@
 #~ msgstr "不足するプラグインをダウンロードします。"
 
-#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -33157,5 +34036,6 @@
 #~ "{0}"
 #~ msgstr ""
-#~ "プラグインはすでに有効です。現在のプラグインを削除し、新しいバージョンをダウンロードしますか？\n"
+#~ "プラグインはすでに有効です。現在のプラグインを削除し、新しいバージョンをダ"
+#~ "ウンロードしますか？\n"
 #~ "{0}"
 
@@ -33178,5 +34058,4 @@
 #~ msgstr "差異"
 
-#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "情報ディレクトリを読み取れません: {0}"
@@ -33188,5 +34067,4 @@
 #~ msgstr "リレーションに登録すべきものがありません。"
 
-#, java-format
 #~ msgid "Unknown role ''{0}''."
 #~ msgstr "不明なロール\"{0}\"です。"
@@ -33198,9 +34076,7 @@
 #~ msgstr "\"to\"ウェイが見つかりません"
 
-#, java-format
 #~ msgid "Error: {0}"
 #~ msgstr "Error: {0}"
 
-#, java-format
 #~ msgid "Warning: {0}"
 #~ msgstr "Warning: {0}"
@@ -33215,5 +34091,4 @@
 #~ msgstr "セレクションのロード"
 
-#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "連絡先 {0} ..."
@@ -33251,7 +34126,4 @@
 #~ msgid "Select Tableau d'Assemblage"
 #~ msgstr "Tableau d'Assemblageを選択"
-
-#~ msgid "Are you sure?"
-#~ msgstr "よろしいですか？"
 
 #~ msgid "Open images with AgPifoJ..."
@@ -33351,13 +34223,13 @@
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version selected "
-#~ "in the history list."
-#~ msgstr "現在選択している全てのオブジェクトの状態を、ヒストリーの選択したバージョンへと戻します。"
-
-#, java-format
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "現在選択している全てのオブジェクトの状態を、ヒストリーの選択したバージョン"
+#~ "へと戻します。"
+
 #~ msgid "Command Stack: {0}"
 #~ msgstr "指示の集積: {0}"
 
-#, java-format
 #~ msgid "The date in file \"{0}\" could not be parsed."
 #~ msgstr "ファイル \"{0}\"中の日付が取得できません。"
@@ -33381,9 +34253,7 @@
 #~ msgstr "解決したバージョン:"
 
-#, java-format
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "URL: \"{0}\"から読み込むことができません"
 
-#, java-format
 #~ msgid "Parsing error in URL: \"{0}\""
 #~ msgstr "URL: \"{0}\"の走査エラー"
@@ -33413,9 +34283,7 @@
 #~ msgstr "ヌルポインタ例外です。失われたタグがあるのでしょう。"
 
-#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "{0}でトラブルチケットを報告してください。"
 
-#, java-format
 #~ msgid "Inner way ''{0}'' is outside."
 #~ msgstr "内部のウェイ ''{0}''が外側にあります。"
@@ -33424,13 +34292,10 @@
 #~ msgstr "要素の履歴"
 
-#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "ページ{0}を読み込む際にエラーが発生しました。"
 
-#, java-format
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "グループ \"{1}\"のプリセット\"{0}\"を使います"
 
-#, java-format
 #~ msgid "Use preset ''{0}''"
 #~ msgstr "プリセット \"{0}\"を使います"
@@ -33439,14 +34304,11 @@
 #~ msgstr "選択の削除"
 
-#, java-format
 #~ msgid "rectifier id={0}"
 #~ msgstr "修正子 ID={0}"
 
-#, java-format
 #~ msgid "Downloaded plugin information from {0} site"
 #~ msgid_plural "Downloaded plugin information from {0} sites"
 #~ msgstr[0] "{0} このサイトからプラグイン情報をダウンロードしました。"
 
-#, java-format
 #~ msgid "Unknown member type for ''{0}''."
 #~ msgstr "{0}のメンバーのタイプが不明"
@@ -33469,10 +34331,11 @@
 
 #~ msgid ""
-#~ "You are about to delete nodes outside of the area you have "
-#~ "downloaded.<br>This can cause problems because other objects (that you don't "
-#~ "see) might use them.<br>Do you really want to delete?"
+#~ "You are about to delete nodes outside of the area you have downloaded."
+#~ "<br>This can cause problems because other objects (that you don't see) "
+#~ "might use them.<br>Do you really want to delete?"
 #~ msgstr ""
-#~ "ダウンロードしたエリア外のノードを削除しようとしています。<br>（あなたが見ていない）ほかのオブジェクトが使っているかもしれないので、この操作は問題を引"
-#~ "き起こします。<br>本当に削除しますか？"
+#~ "ダウンロードしたエリア外のノードを削除しようとしています。<br>（あなたが見"
+#~ "ていない）ほかのオブジェクトが使っているかもしれないので、この操作は問題を"
+#~ "引き起こします。<br>本当に削除しますか？"
 
 #~ msgid "All the ways were empty"
@@ -33495,14 +34358,17 @@
 
 #~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission to "
-#~ "overwrite the existing ones."
-#~ msgstr "アップロードしたプラグインを有効にできませんでした。JOSMが既存のプラグインに上書きできる権限があるかどうか、確認してください。"
+#~ "Activating the updated plugins failed. Check if JOSM has the permission "
+#~ "to overwrite the existing ones."
+#~ msgstr ""
+#~ "アップロードしたプラグインを有効にできませんでした。JOSMが既存のプラグイン"
+#~ "に上書きできる権限があるかどうか、確認してください。"
 
 #~ msgid ""
 #~ "The plugin could not be removed. Please tell the people you got JOSM from "
 #~ "about the problem."
-#~ msgstr "プラグインを削除できませんでした。JOSMを入手した方に問題を報告してください。"
-
-#, java-format
+#~ msgstr ""
+#~ "プラグインを削除できませんでした。JOSMを入手した方に問題を報告してくださ"
+#~ "い。"
+
 #~ msgid "multipolygon way ''{0}'' is not closed."
 #~ msgstr "マルチポリゴンのウェイ \"{0}\"は閉じていません。"
@@ -33514,17 +34380,13 @@
 #~ msgstr "二つ以上の\"to\"ウェイがあります。"
 
-#, java-format
 #~ msgid "Style for restriction {0} not found."
 #~ msgstr "制約条件{0}のスタイルがありません。"
 
-#, java-format
 #~ msgid "No useful role ''{0}'' for Way ''{1}''."
 #~ msgstr "ウェイ\"{1}\"に有効なロール\"{0}\"がありません。"
 
-#, java-format
 #~ msgid "Non-Way ''{0}'' in multipolygon."
 #~ msgstr "マルチポリゴンにウェイではない\"{0}\"があります。"
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -33541,7 +34403,9 @@
 
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want to "
-#~ "combine them?"
-#~ msgstr "選択したウェイは、それぞれ異なった関連へ含まれています。それでも、結合しますか？"
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
+#~ msgstr ""
+#~ "選択したウェイは、それぞれ異なった関連へ含まれています。それでも、結合しま"
+#~ "すか？"
 
 #~ msgid "Combine ways with different memberships?"
@@ -33555,5 +34419,6 @@
 
 #~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr "少なくとも４ノードからなる閉じたウェイを、一つ以上選択してください。"
+#~ msgstr ""
+#~ "少なくとも４ノードからなる閉じたウェイを、一つ以上選択してください。"
 
 #~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
@@ -33575,10 +34440,11 @@
 #~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
 #~ "move mouse.   Select: Click."
-#~ msgstr "ズーム:マウスのホイールか、ダブルクリック。地図の移動：右マウスボタンを押した状態で移動させる。選択：クリック。"
+#~ msgstr ""
+#~ "ズーム:マウスのホイールか、ダブルクリック。地図の移動：右マウスボタンを押"
+#~ "した状態で移動させる。選択：クリック。"
 
 #~ msgid "Login"
 #~ msgstr "ログイン"
 
-#, java-format
 #~ msgid "There is no EXIF time within the file \"{0}\"."
 #~ msgstr "ファイル\"{0}\"にEXIFの時刻情報がありません。"
@@ -33597,9 +34463,7 @@
 #~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
 #~ msgstr ""
-#~ "タグ付けのソース(URL "
-#~ "やファイル名)が、定義ファイルに設定してあります。詳しくは、http://josm.openstreetmap.de/wiki/TaggingPreset"
-#~ "s を見てください。"
-
-#, java-format
+#~ "タグ付けのソース(URL やファイル名)が、定義ファイルに設定してあります。詳し"
+#~ "くは、http://josm.openstreetmap.de/wiki/TaggingPresets を見てください。"
+
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -33618,5 +34482,4 @@
 #~ msgstr "下に移動"
 
-#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "関連の編集者:{0}"
@@ -33635,5 +34498,6 @@
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you load\n"
+#~ "Parameters are read in the order they are specified, so make sure you "
+#~ "load\n"
 #~ "some data before --selection"
 #~ msgstr ""
@@ -33655,7 +34519,8 @@
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still want "
-#~ "to merge them?"
-#~ msgstr "選択したノードは、異なった関連に属しています。それでも、結合しますか？"
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
+#~ msgstr ""
+#~ "選択したノードは、異なった関連に属しています。それでも、結合しますか？"
 
 #~ msgid "Merge nodes with different memberships?"
@@ -33663,18 +34528,24 @@
 
 #~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this as "
-#~ "a bug."
-#~ msgstr "内部エラー：レイヤーのないところで条件チェックはできません。バグとして報告してください。"
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
+#~ msgstr ""
+#~ "内部エラー：レイヤーのないところで条件チェックはできません。バグとして報告"
+#~ "してください。"
 
 #~ msgid ""
 #~ "Please select at least one node, way or relation. Only already uploaded "
 #~ "elements have a history."
-#~ msgstr "少なくとも1つはノード・ウェイ・リレーションを選択してください。既にアップロードされた要素だけに遍歴があります。"
+#~ msgstr ""
+#~ "少なくとも1つはノード・ウェイ・リレーションを選択してください。既にアップ"
+#~ "ロードされた要素だけに遍歴があります。"
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data layer?"
-#~ msgstr "更新するデータは見つかりませんでした。もう既にデータレイヤーを開いているか、ダウンロードしましたか？"
-
-#, java-format
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
+#~ msgstr ""
+#~ "更新するデータは見つかりませんでした。もう既にデータレイヤーを開いている"
+#~ "か、ダウンロードしましたか？"
+
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
@@ -33685,9 +34556,7 @@
 #~ msgstr "OSMにアップロード"
 
-#, java-format
 #~ msgid "Style for inner way ''{0}'' equals multipolygon."
 #~ msgstr "マルチポリゴンと等しい、内側のウェイ ''{0}'' 用のスタイル。"
 
-#, java-format
 #~ msgid "No outer way for multipolygon ''{0}''."
 #~ msgstr "マルチポリゴン用の外側のウェイが ''{0}'' にありません。"
@@ -33708,5 +34577,4 @@
 #~ msgstr "とりあえず続ける"
 
-#, java-format
 #~ msgid "Change the projection to {0} first."
 #~ msgstr "最初に投影法を {0} に変えてください。"
@@ -33719,7 +34587,9 @@
 
 #~ msgid ""
-#~ "An error occured while trying to match the photos to the GPX track. You can "
-#~ "adjust the sliders to manually match the photos."
-#~ msgstr "GPXトラックに写真を合わせようとしているときにエラーが起きました。スライダーを調整して、手動で写真に合わせることができます。"
+#~ "An error occured while trying to match the photos to the GPX track. You "
+#~ "can adjust the sliders to manually match the photos."
+#~ msgstr ""
+#~ "GPXトラックに写真を合わせようとしているときにエラーが起きました。スライ"
+#~ "ダーを調整して、手動で写真に合わせることができます。"
 
 #~ msgid "Map Type"
@@ -33790,18 +34660,16 @@
 
 #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
-#~ msgstr "Metacarta's Map Rectifier WMS から 幾何補正されたイメージのダウンロード"
+#~ msgstr ""
+#~ "Metacarta's Map Rectifier WMS から 幾何補正されたイメージのダウンロード"
 
 #~ msgid "Really mark this issue as ''done''?"
 #~ msgstr "本当に、この問題を“処理済み”としてマークしますか？"
 
-#, java-format
 #~ msgid "Style for outer way ''{0}'' mismatches."
 #~ msgstr "外側のウェイ ''{0}''のスタイルが合いません。"
 
-#, java-format
 #~ msgid "Found {0} matches of {1} in GPX track {2}"
 #~ msgstr "GPX トラック {2} に、{1}中に{0}枚発見しました。"
 
-#, java-format
 #~ msgid "Offset between track and photos: {0}m {1}s"
 #~ msgstr "トラックと写真の間には、時差があります。: {0}分 {1}秒"
@@ -33809,5 +34677,7 @@
 #~ msgid ""
 #~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
-#~ msgstr "<html>私のGPSレシーバーは写真を撮ることができます。<br>これは使えますか。</html>"
+#~ msgstr ""
+#~ "<html>私のGPSレシーバーは写真を撮ることができます。<br>これは使えますか。"
+#~ "</html>"
 
 #~ msgid "YAHOO (WebKit GTK)"
@@ -33820,9 +34690,7 @@
 #~ msgstr "GPSユニットのタイムゾーン(写真の時間との違い)"
 
-#, java-format
 #~ msgid "Image with path {0} does not exist or is not readable."
 #~ msgstr "パス {0} にあるイメージは存在しないか、読めません。"
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -33864,33 +34732,40 @@
 #~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
 #~ "import EXIF geotagged pictures."
-#~ msgstr "標準とは別の JOSM 用ジオタグ plugin。GPS ログと、写真の EXIFに埋め込まれたジオタグを関連づけします。"
-
-#, java-format
+#~ msgstr ""
+#~ "標準とは別の JOSM 用ジオタグ plugin。GPS ログと、写真の EXIFに埋め込まれた"
+#~ "ジオタグを関連づけします。"
+
 #~ msgid "Plugin {0} requires JOSM update to version {1}."
-#~ msgstr "プラグイン {0} を使うには JOSMをバージョン {1} にアップデートする必要があります。"
+#~ msgstr ""
+#~ "プラグイン {0} を使うには JOSMをバージョン {1} にアップデートする必要があ"
+#~ "ります。"
 
 #~ msgid ""
 #~ "(You can change the number of days after which this warning appears<br>by "
 #~ "setting the config option 'pluginmanager.warntime'.)"
-#~ msgstr "（この警告が何日で表示されるかは<br>設定オプションの'pluginmanager.warntime'を編集することで変更できます）"
-
-#, java-format
+#~ msgstr ""
+#~ "（この警告が何日で表示されるかは<br>設定オプションの'pluginmanager."
+#~ "warntime'を編集することで変更できます）"
+
 #~ msgid ""
 #~ "Current number of changes exceeds the max. number of changes, current is "
 #~ "{0}, max is {1}"
-#~ msgstr "現在の変更数が最大値を越えました。変更数の現在値は {0}で、最大値は {1}です。"
-
-#, java-format
+#~ msgstr ""
+#~ "現在の変更数が最大値を越えました。変更数の現在値は {0}で、最大値は {1}で"
+#~ "す。"
+
 #~ msgid ""
 #~ "WARNING: launching browser windows for the first {0} of {1} selected "
 #~ "primitives only"
-#~ msgstr "警告：ブラウザウインドウを開くのは、選択したプリミティブの{1}のうち、最初の{0}だけです。"
-
-#, java-format
+#~ msgstr ""
+#~ "警告：ブラウザウインドウを開くのは、選択したプリミティブの{1}のうち、最初"
+#~ "の{0}だけです。"
+
 #~ msgid ""
 #~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
 #~ msgid_plural ""
 #~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
-#~ msgstr[0] "{0} のレイヤーに保存されていない変更があります。変更を無視して続けますか?"
+#~ msgstr[0] ""
+#~ "{0} のレイヤーに保存されていない変更があります。変更を無視して続けますか?"
 
 #~ msgid "Close current changeset"
@@ -33900,33 +34775,33 @@
 #~ msgstr "新しい変更セットを使用して閉じる"
 
-#, java-format
 #~ msgid "Use the existing changeset {0} and close it after upload"
 #~ msgstr "既存の変更セット {0} を使用しアップロード後に閉じる"
 
-#, java-format
 #~ msgid ""
 #~ "Select to upload to the existing changeset {0} and to close the changeset "
 #~ "after this upload"
-#~ msgstr "選択の上、既存の変更セット {0} にアップロードし、アップロード後に変更セットを閉じる"
-
-#, java-format
+#~ msgstr ""
+#~ "選択の上、既存の変更セット {0} にアップロードし、アップロード後に変更セッ"
+#~ "トを閉じる"
+
 #~ msgid "Use the existing changeset {0} and leave it open"
 #~ msgstr "既存の変更セット {0} を使用し開いたままにしておく"
 
-#, java-format
 #~ msgid ""
 #~ "Select to upload to the existing changeset {0} and to leave the changeset "
 #~ "open for further uploads"
-#~ msgstr "選択の上、既存の変更セット {0} へアップロードし、さらにアップロードするために変更セットを開いておく"
-
-#, java-format
+#~ msgstr ""
+#~ "選択の上、既存の変更セット {0} へアップロードし、さらにアップロードするた"
+#~ "めに変更セットを開いておく"
+
 #~ msgid ""
 #~ "<html>Failed to close changeset ''{0}'' on the OSM server ''{1}''.<br>The "
-#~ "changeset will automatically be closed by the server after a timeout.</html>"
+#~ "changeset will automatically be closed by the server after a timeout.</"
+#~ "html>"
 #~ msgstr ""
-#~ "<html>OSM サーバ ''{1}'' 上の変更セット ''{0}'' "
-#~ "を閉じられませんでした。<br>変更セットはタイムアウト後にサーバによって自動的に閉じられます。</html>"
-
-#, java-format
+#~ "<html>OSM サーバ ''{1}'' 上の変更セット ''{0}'' を閉じられませんでした。"
+#~ "<br>変更セットはタイムアウト後にサーバによって自動的に閉じられます。</"
+#~ "html>"
+
 #~ msgid "Changeset {0} is unchanged. Skipping update."
 #~ msgstr "変更セット {0} は変更されていません。更新をスキップします。"
@@ -33935,19 +34810,20 @@
 #~ msgstr "現在変更セットは開かれていません。新しい変更セットを開いています..."
 
-#, java-format
 #~ msgid "Reusing existing changeset {0}"
 #~ msgstr "既存の変更セット {0} を再利用しています"
 
 #~ msgid ""
-#~ "Warning: could not reuse an existing changeset as requested. Opening a new "
-#~ "one."
-#~ msgstr "警告: 要求された既存の変更セットを再利用できません。新しく開いています。"
+#~ "Warning: could not reuse an existing changeset as requested. Opening a "
+#~ "new one."
+#~ msgstr ""
+#~ "警告: 要求された既存の変更セットを再利用できません。新しく開いています。"
 
 #~ msgid ""
-#~ "Failed to update changeset. Either there is no current changeset or the id "
-#~ "of the current changeset is 0"
-#~ msgstr "変更セットの更新に失敗しました。現在の変更セットが無いか、または現在の変更セットのIDが 0 です。"
-
-#, java-format
+#~ "Failed to update changeset. Either there is no current changeset or the "
+#~ "id of the current changeset is 0"
+#~ msgstr ""
+#~ "変更セットの更新に失敗しました。現在の変更セットが無いか、または現在の変更"
+#~ "セットのIDが 0 です。"
+
 #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 #~ msgstr "エラー　ヘッダ \"{0}\" は期待パターン \"{1}\" に一致しません"
@@ -33968,14 +34844,14 @@
 #~ msgstr "削除または移動されたプリミティブ"
 
-#, java-format
 #~ msgid ""
 #~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
 #~ "nodes or range, for example nodes:10-20"
-#~ msgstr "不正なノード演算子の値: {0}。ノード演算子はノードの数や範囲で指定してください、例えば ノード: 10-20"
+#~ msgstr ""
+#~ "不正なノード演算子の値: {0}。ノード演算子はノードの数や範囲で指定してくだ"
+#~ "さい、例えば ノード: 10-20"
 
 #~ msgid "Always move and don't show dialog again"
 #~ msgstr "常に移動し、ダイアログ表示は不要"
 
-#, java-format
 #~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
 #~ msgstr "パターン文法エラー: {1} 内のパターン {0} は正しくありません！"
@@ -33990,40 +34866,42 @@
 #~ msgstr "競合が検出されました"
 
-#, java-format
 #~ msgid ""
 #~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
 #~ "relation?</html>"
 #~ msgstr ""
-#~ "<html>選択 \"{0}\" はリレーション \"{1}\" で使用されています。<br>リレーションから削除しますか？</html>"
-
-#, java-format
+#~ "<html>選択 \"{0}\" はリレーション \"{1}\" で使用されています。<br>リレー"
+#~ "ションから削除しますか？</html>"
+
 #~ msgid "Incorrect value of id operator: {0}. Number is expected."
 #~ msgstr "不正なid演算子の値: {0}。数字を入力してください。"
 
 #~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
-#~ msgstr "このデータセットには id {0} バージョン {1} のプリミティブはありません"
+#~ msgstr ""
+#~ "このデータセットには id {0} バージョン {1} のプリミティブはありません"
 
 #~ msgid ""
-#~ "Enable to upload all changes in one request, disable to use one request per "
-#~ "changed primitive"
-#~ msgstr "一度のリクエストで全ての変更をアップロードするには有効にする。変更したプリミティブごとにリクエストするには、無効にする。"
-
-#, java-format
+#~ "Enable to upload all changes in one request, disable to use one request "
+#~ "per changed primitive"
+#~ msgstr ""
+#~ "一度のリクエストで全ての変更をアップロードするには有効にする。変更したプリ"
+#~ "ミティブごとにリクエストするには、無効にする。"
+
 #~ msgid ""
 #~ "<html>There are {0} primitives in your local dataset which<br>might be "
 #~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
-#~ "to check the state of these primitives<br>on the server.<br>Click "
+#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
+#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
 #~ "<strong>{2}</strong> to ignore.<br></html>"
 #~ msgstr ""
-#~ "<html>あなたのローカルセットにある{0} "
-#~ "個のプリミティブが、<br>おそらくサーバーでは削除されています。これらをあとで削除したり、更新しようとすると、サーバーは<br>競合<br>と報告するで"
-#~ "しょう。<br>サーバー上のこれらのプリミティブの状態を確認するには<br><strong>{1}</strong>をクリックしてください。 "
-#~ "<br>無視するには、<strong>{2}</strong>をクリックしてください。<br></html>"
+#~ "<html>あなたのローカルセットにある{0} 個のプリミティブが、<br>おそらくサー"
+#~ "バーでは削除されています。これらをあとで削除したり、更新しようとすると、"
+#~ "サーバーは<br>競合<br>と報告するでしょう。<br>サーバー上のこれらのプリミ"
+#~ "ティブの状態を確認するには<br><strong>{1}</strong>をクリックしてくださ"
+#~ "い。 <br>無視するには、<strong>{2}</strong>をクリックしてください。<br></"
+#~ "html>"
 
 #~ msgid "Primitive already deleted"
 #~ msgstr "プリミティブは削除済み"
 
-#, java-format
 #~ msgid ""
 #~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
@@ -34031,6 +34909,6 @@
 #~ "is:<br>{0}</html>"
 #~ msgstr ""
-#~ "<html>アップロード <strong>失敗</strong> "
-#~ "サーバから削除しようとしたプリミティブは既に削除されています。<br><br>エラーメッセージ:<br>{0}</html>"
+#~ "<html>アップロード <strong>失敗</strong> サーバから削除しようとしたプリミ"
+#~ "ティブは既に削除されています。<br><br>エラーメッセージ:<br>{0}</html>"
 
 #~ msgid "not yet decided"
@@ -34041,17 +34919,19 @@
 
 #~ msgid "Dialog not created yet. Invoke createInstance() first"
-#~ msgstr "ダイアログはまだ作成されていません。最初に createInstance() を呼び出してください"
+#~ msgstr ""
+#~ "ダイアログはまだ作成されていません。最初に createInstance() を呼び出してく"
+#~ "ださい"
 
 #~ msgid "Conflicts in data"
 #~ msgstr "データ内の競合"
 
-#, java-format
 #~ msgid ""
-#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal to "
-#~ "deleting the roles of these primitives.<br>Do you really want to apply the "
-#~ "new role?</html>"
+#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
+#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
+#~ "the new role?</html>"
 #~ msgstr ""
-#~ "<html>空のロールを {0} "
-#~ "プリミティブにセットしようとしています。<br>これはロールを削除することになります。<br>新しいロールを本当に適用しますか？</html>"
+#~ "<html>空のロールを {0} プリミティブにセットしようとしています。<br>これは"
+#~ "ロールを削除することになります。<br>新しいロールを本当に適用しますか？</"
+#~ "html>"
 
 #~ msgid "Linked"
@@ -34073,15 +34953,16 @@
 #~ msgstr "OSM ユーザ名 (e-mail)"
 
-#, java-format
 #~ msgid "Plug-in named {0} is not available. Update skipped."
-#~ msgstr "{0} という名前のプラグインは利用できません。更新はスキップされました。"
+#~ msgstr ""
+#~ "{0} という名前のプラグインは利用できません。更新はスキップされました。"
 
 #~ msgid "The plugin could not be removed. Probably it was already disabled"
 #~ msgstr "プラグインは削除できませんでした。おそらく既に無効化されています"
 
-#, java-format
 #~ msgid ""
 #~ "Loading of {0} plugin was requested. This plugin is no longer required."
-#~ msgstr "{0} プラグインのロードが要求されました。このプラグインは今は必須ではありません。"
+#~ msgstr ""
+#~ "{0} プラグインのロードが要求されました。このプラグインは今は必須ではありま"
+#~ "せん。"
 
 #~ msgid "Confirmation"
@@ -34091,40 +34972,39 @@
 #~ msgstr "ラインの終端に到達"
 
-#, java-format
 #~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-#~ "from relation?</html>"
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
 #~ msgstr ""
-#~ "<html>選択 \"{0}\" は、リレーション \"{1}\" のロール "
-#~ "{2}で使用されています。<br>リレーションから削除しますか?</html>"
-
-#, java-format
+#~ "<html>選択 \"{0}\" は、リレーション \"{1}\" のロール {2}で使用されていま"
+#~ "す。<br>リレーションから削除しますか?</html>"
+
 #~ msgid "removing reference from way {0}"
 #~ msgstr "ウェイ {0}から、参照を取り除く"
 
-#, java-format
 #~ msgid ""
 #~ "<html>Failed to create an URL because the encoding ''{0}'' was<br>was "
 #~ "missing on this system.</html>"
-#~ msgstr "<html>URL の作成に失敗しました。エンコーディング ''{0}''は<br>このシステムにはありません。</html>"
-
-#, java-format
+#~ msgstr ""
+#~ "<html>URL の作成に失敗しました。エンコーディング ''{0}''は<br>このシステム"
+#~ "にはありません。</html>"
+
 #~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
-#~ msgstr "リレーション {1} のメンバー {0} に予期しない \"type\"、 {2} を受け取りました。"
+#~ msgstr ""
+#~ "リレーション {1} のメンバー {0} に予期しない \"type\"、 {2} を受け取りまし"
+#~ "た。"
 
 #~ msgid "Select a starting node on the end of a way"
 #~ msgstr "ウェイ終端の開始ノードを選択"
 
-#, java-format
 #~ msgid "The XML source (URL or filename) for {0} definition files."
 #~ msgstr "{0} 定義ファイル用XML ソース(URL またはファイル名)。"
 
-#, java-format
 #~ msgid ""
 #~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
 #~ "resolve them first.</html>"
-#~ msgstr "<html>レイヤー ''{0}'' に未解決の競合があります。<br>これを最初に解決してください。</html>"
-
-#, java-format
+#~ msgstr ""
+#~ "<html>レイヤー ''{0}'' に未解決の競合があります。<br>これを最初に解決して"
+#~ "ください。</html>"
+
 #~ msgid "paramete''{0}'' must not be null"
 #~ msgstr "パラメータ''{0}'' はヌルでなければなりません"
@@ -34135,8 +35015,8 @@
 #~ "Hold left mousebutton and draw a frame."
 #~ msgstr ""
-#~ "<b>ズーム:</b> マウスホイール、ダブルクリックまたは Ctrl + Up/Down <b>マップを移動:</b> "
-#~ "右クリックしたままマウスを移動またはカーソルキーを使用。<b>選択:</b> 左クリックしたままフレームをドロー。"
-
-#, java-format
+#~ "<b>ズーム:</b> マウスホイール、ダブルクリックまたは Ctrl + Up/Down <b>マッ"
+#~ "プを移動:</b> 右クリックしたままマウスを移動またはカーソルキーを使用。<b>"
+#~ "選択:</b> 左クリックしたままフレームをドロー。"
+
 #~ msgid "Missing mandatory attribute ''{0}''"
 #~ msgstr "必要な属性 ''{0}'' がありません"
@@ -34147,12 +35027,14 @@
 #~ "Are you really sure to continue?"
 #~ msgstr ""
-#~ "選択されたウェイにはダウンロードされたデータ領域の外側にノードがあります。\n"
+#~ "選択されたウェイにはダウンロードされたデータ領域の外側にノードがありま"
+#~ "す。\n"
 #~ "これはノードを誤って削除する可能性があります。\n"
 #~ "本当に続けますか？"
 
-#, java-format
-#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
+#~ msgid ""
+#~ "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them all?"
+#~ "The selection contains {0} ways. Are you sure you want to simplify them "
+#~ "all?"
 #~ msgstr[0] "選択には {0} ウェイが含まれます。本当に簡略化しますか？"
 
@@ -34166,19 +35048,21 @@
 #~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
 #~ "found."
-#~ msgstr "JOSM が想定外のバージョンです。Main.ds および Main.getCurrentDataSet() が見つかりません。"
+#~ msgstr ""
+#~ "JOSM が想定外のバージョンです。Main.ds および Main.getCurrentDataSet() が"
+#~ "見つかりません。"
 
 #~ msgid "Check if map painting found data errors."
 #~ msgstr "地図塗りつぶしでデータエラーがあるかどうかチェック"
 
-#, java-format
 #~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "ヘルプページがありません。<A HREF=\"{0}\">英語</A>で作成してください。"
-
-#, java-format
+#~ msgstr ""
+#~ "ヘルプページがありません。<A HREF=\"{0}\">英語</A>で作成してください。"
+
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
 #~ msgstr ""
-#~ "ヘルプページがありません。<A HREF=\"{0}\">英語</A> または <A HREF=\"{1}\">あなたの言語</A>で作成してください。"
+#~ "ヘルプページがありません。<A HREF=\"{0}\">英語</A> または <A HREF=\"{1}\">"
+#~ "あなたの言語</A>で作成してください。"
 
 #~ msgid "Didn't find an primitive with id {0} in this dataset"
@@ -34186,12 +35070,14 @@
 
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "ヘルプページがありません。<A HREF=\"{0}\">英語</A>でそれを作成してください。"
+#~ msgstr ""
+#~ "ヘルプページがありません。<A HREF=\"{0}\">英語</A>でそれを作成してくださ"
+#~ "い。"
 
 #~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
 #~ msgstr ""
-#~ "ヘルプページがありません。<A HREF=\"{0}\">英語</A>もしくは<A "
-#~ "HREF=\"{1}\">あなたの母国語</A>でそれを作成してください。"
+#~ "ヘルプページがありません。<A HREF=\"{0}\">英語</A>もしくは<A HREF=\"{1}\">"
+#~ "あなたの母国語</A>でそれを作成してください。"
 
 #~ msgid "Apply also for children"
@@ -34201,5 +35087,4 @@
 #~ msgstr "現在の変更セットはヌルです。データをアップロードできません。"
 
-#, java-format
 #~ msgid "Expected instance of OsmDataLayer. Got ''{0}''."
 #~ msgstr "OsmDataLayerのインスタンスであるべきです。 入力値: ''{0}''。"
@@ -34209,7 +35094,9 @@
 
 #~ msgid ""
-#~ "WARNING: no API version defined for data to upload. Falling back to version "
-#~ "0.6"
-#~ msgstr "警告: アップロードするデータにAPIバージョンが定義されていません。バージョン0.6 にフォールバックします。"
+#~ "WARNING: no API version defined for data to upload. Falling back to "
+#~ "version 0.6"
+#~ msgstr ""
+#~ "警告: アップロードするデータにAPIバージョンが定義されていません。バージョ"
+#~ "ン0.6 にフォールバックします。"
 
 #~ msgid "<html>"
@@ -34219,23 +35106,22 @@
 #~ msgstr "ガウス-ラボルド会議1947"
 
-#, java-format
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "予期せぬ値が返って来ました。 {0} を受けとりました。"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
 #~ msgstr "パラメータ {0} > 0 が必須です。 {1} を受け取りました。"
 
-#, java-format
 #~ msgid "Expected ID >= 0. Got {0}."
 #~ msgstr "ID >= 0 である必要があります。 {0} を受け取りました"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
-#~ msgstr "パラメータ ''{0}'' は正しいタイプ名ではありません、 ''{1}'' を受け取りました"
-
-#, java-format
+#~ msgstr ""
+#~ "パラメータ ''{0}'' は正しいタイプ名ではありません、 ''{1}'' を受け取りまし"
+#~ "た"
+
 #~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-#~ msgstr "パラメータ ''{0}'' は受け入れ可能なクラスではありません、 ''{1}'' を受け取りました"
+#~ msgstr ""
+#~ "パラメータ ''{0}'' は受け入れ可能なクラスではありません、 ''{1}'' を受け取"
+#~ "りました"
 
 #~ msgid "There's no primitive with version {0} in this history."
@@ -34245,7 +35131,8 @@
 #~ msgstr "履歴の日付 ''{0}'' には有効なバージョンはありません"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-#~ msgstr "パラメータ {0} は 0..{1} の範囲内である必要があります、 {2} を受け取りました"
+#~ msgstr ""
+#~ "パラメータ {0} は 0..{1} の範囲内である必要があります、 {2} を受け取りまし"
+#~ "た"
 
 #~ msgid "No earliest version found. History is empty."
@@ -34255,21 +35142,19 @@
 #~ msgstr "最新のバージョンがありません。履歴は空です。"
 
-#, java-format
 #~ msgid "Parameter current out of range. Got {0}."
 #~ msgstr "現在のパラメータは範囲外です: {0} を受け取りました"
 
-#, java-format
 #~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
-#~ msgstr "パラメータ 'col' は0 または 1でなければなりません。{0} を受け取りました"
-
-#, java-format
+#~ msgstr ""
+#~ "パラメータ 'col' は0 または 1でなければなりません。{0} を受け取りました"
+
 #~ msgid "Parameter ''{0}'' must not be empty."
 #~ msgstr "パラメータ ''{0}'' は空以外でなければなりません"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
-#~ msgstr "タグのパラメーター ''{0}'' は、厳格に1つのキーであることが期待されています。 {1} を受けとりました。"
-
-#, java-format
+#~ msgstr ""
+#~ "タグのパラメーター ''{0}'' は、厳格に1つのキーであることが期待されていま"
+#~ "す。 {1} を受けとりました。"
+
 #~ msgid "Index out of bounds. Got {0}."
 #~ msgstr "範囲外のインデックス。{0} を受け取りました"
@@ -34278,68 +35163,62 @@
 #~ msgstr "選択されたプリミティブの履歴を表示"
 
-#, java-format
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "\"{0}\"を読み込めません。"
 
-#, java-format
 #~ msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 #~ msgstr "属性 ''uid'' に不正な値。入力値: ''{0}''"
 
-#, java-format
 #~ msgid ""
 #~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
 #~ msgstr "int 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
 
-#, java-format
 #~ msgid ""
-#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
+#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got "
+#~ "''{1}''."
 #~ msgstr "int 型(>=0)の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
 
-#, java-format
 #~ msgid ""
 #~ "Unknown relation member type ''{0}'' in relation with external id ''{1}''."
-#~ msgstr "外部ID ''{1}'' のリレーションに不明なリレーションメンバータイプ ''{0}''"
-
-#, java-format
+#~ msgstr ""
+#~ "外部ID ''{1}'' のリレーションに不明なリレーションメンバータイプ ''{0}''"
+
 #~ msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 #~ msgstr "ID パラメータ ''{0}'' > 0 必須です。 {1} を受け取りました"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 #~ msgstr "パラメータ ''{0}'' >= 0 であるべきです。 {1} を受け取りました"
 
-#, java-format
 #~ msgid "Value of child.getId() > 0 expected. Got {1}."
 #~ msgstr "child.getId() の値 > 0 であるべきです。入力値: {1}。"
 
-#, java-format
 #~ msgid ""
 #~ "WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
-#~ "use diff uploads, but API is not able to handle them. Ignoring diff upload."
+#~ "use diff uploads, but API is not able to handle them. Ignoring diff "
+#~ "upload."
 #~ msgstr ""
-#~ "警告: 設定 ''{0}'' またはデータセットのAPI バージョン ''{1}'' では差分アップロードの使用が必須ですが、API "
-#~ "は取扱えません。差分アップロードを無視します。"
-
-#, java-format
+#~ "警告: 設定 ''{0}'' またはデータセットのAPI バージョン ''{1}'' では差分アッ"
+#~ "プロードの使用が必須ですが、API は取扱えません。差分アップロードを無視しま"
+#~ "す。"
+
 #~ msgid "Preset group ''{0}'' of group ''{1}''"
 #~ msgstr "プリセットのグループ ''{1}'' のグループ ''{0}''"
 
-#, java-format
 #~ msgid "Unexpected column index. Got {0}."
 #~ msgstr "予期せぬカラムインデックス。入力値: {0}"
 
-#, java-format
 #~ msgid ""
-#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
-#~ "default geometry. Details: {1}"
+#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back "
+#~ "to default geometry. Details: {1}"
 #~ msgstr ""
-#~ "キー ''{0}'' からの window geometry の復元に失敗しました。デフォルトのgeometry にフォールバックします。詳細: {1}"
+#~ "キー ''{0}'' からの window geometry の復元に失敗しました。デフォルトの"
+#~ "geometry にフォールバックします。詳細: {1}"
 
 #~ msgid ""
-#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
-#~ "the following\n"
+#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to "
+#~ "add the following\n"
 #~ "      Java option to increase the maximum size of allocated memory"
 #~ msgstr ""
-#~ "通知: いくつかのタスクで、JOSMに は多くのメモリが必要です。下記の追加が必要です\n"
+#~ "通知: いくつかのタスクで、JOSMに は多くのメモリが必要です。下記の追加が必"
+#~ "要です\n"
 #~ "     Javaの使用メモリ最大サイズを増やすオプション"
 
@@ -34347,11 +35226,10 @@
 #~ msgstr "ランベルトzone を手動設定 (例：２つのゾーン間の位置用)"
 
-#, java-format
 #~ msgid "Relation: from {0} to {1} via {2}"
 #~ msgstr "リレーション: {0} から {1} まで {2} 経由"
 
 #~ msgid ""
-#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
-#~ "these will then show up in the WMS menu.\n"
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
 #~ "\n"
 #~ "You can also do this manually in the Advanced Preferences, using the "
@@ -34367,6 +35245,6 @@
 #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
 #~ "only need to input the relevant 'id'.\n"
-#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in "
-#~ "this example, replacing 73 with your image id:\n"
+#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
+#~ "in this example, replacing 73 with your image id:\n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -34375,5 +35253,6 @@
 #~ "use."
 #~ msgstr ""
-#~ "WMSplugin 設定タブのWMS エントリを追加、編集、削除できます - これはWMS メニューに表示されます。\n"
+#~ "WMSplugin 設定タブのWMS エントリを追加、編集、削除できます - これはWMS メ"
+#~ "ニューに表示されます。\n"
 #~ "\n"
 #~ "高度な設定によって、次のスキーマを使うことで手動でも行えますできます:\n"
@@ -34386,17 +35265,20 @@
 #~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
 #~ "\n"
-#~ "Metacarta's 地図用Rectifier http://labs.metacarta.com/rectifier/ , 関連する 'id' "
-#~ "を入力するだけです。\n"
-#~ "Metacarta 地図Rectifier メニューアイテムを追加するには、手動で下記例のようなURL を生成してください、73 "
-#~ "のところはあなたの画像ID に置き換えます:\n"
+#~ "Metacarta's 地図用Rectifier http://labs.metacarta.com/rectifier/ , 関連す"
+#~ "る 'id' を入力するだけです。\n"
+#~ "Metacarta 地図Rectifier メニューアイテムを追加するには、手動で下記例のよう"
+#~ "なURL を生成してください、73 のところはあなたの画像ID に置き換えます:\n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
 #~ "\n"
-#~ "お知らせ: 画像はコピーライト表示に従い、疑わしいものは使用しないでください。"
+#~ "お知らせ: 画像はコピーライト表示に従い、疑わしいものは使用しないでくださ"
+#~ "い。"
 
 #~ msgid ""
-#~ "Several utilities that make your life easier: e.g. simplify way, join areas, "
-#~ "jump to position."
-#~ msgstr "あなたの人生をより楽なものにする数種のユーティリティ: 例、ウェイ簡素化、エリア結合、ポジションへのジャンプ"
+#~ "Several utilities that make your life easier: e.g. simplify way, join "
+#~ "areas, jump to position."
+#~ msgstr ""
+#~ "あなたの人生をより楽なものにする数種のユーティリティ: 例、ウェイ簡素化、エ"
+#~ "リア結合、ポジションへのジャンプ"
 
 #~ msgid "Bikes"
@@ -34406,5 +35288,4 @@
 #~ msgstr "更新要求中にエラー: ズームレベル12 ではありません"
 
-#, java-format
 #~ msgid "Via node {0}, {1}"
 #~ msgstr "経由ノード {0}, {1}"
@@ -34414,7 +35295,7 @@
 
 #~ msgid "Replace the way this member refers to with the combined way"
-#~ msgstr "このメンバーが参照しているウェイを結合するウェイと置き換えてください。"
-
-#, java-format
+#~ msgstr ""
+#~ "このメンバーが参照しているウェイを結合するウェイと置き換えてください。"
+
 #~ msgid "Way ''{0}'' with less than two points."
 #~ msgstr "ウェイ\"{0}\"は二つ未満のポイントです。"
@@ -34426,13 +35307,10 @@
 #~ msgstr "領域を指定するウェイが閉じていません。"
 
-#, java-format
 #~ msgid "Intersection between ways ''{0}'' and ''{1}''."
 #~ msgstr "ウェイ \"{0}\"と\"{1}\"の交差する点"
 
-#, java-format
 #~ msgid "MIddle way: {0}"
 #~ msgstr "中間のウェイ: {0}"
 
-#, java-format
 #~ msgid "{0} extrem nodes."
 #~ msgstr "{0} 極値ノード。"
@@ -34441,12 +35319,14 @@
 #~ msgstr "リレーション中の全ての不完全なウェイとノードをダウンロード"
 
-#, java-format
 #~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "OSMデータレイヤーかGPXレイヤーのインスタンスが予期されています。 入力値: ''{0}''。"
-
-#, java-format
+#~ msgstr ""
+#~ "OSMデータレイヤーかGPXレイヤーのインスタンスが予期されています。 入力値: "
+#~ "''{0}''。"
+
 #~ msgid ""
 #~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr "コマンド ''{0}'' をアンドゥできません。なぜならレイヤ ''{1}'' はもうないからです。"
+#~ msgstr ""
+#~ "コマンド ''{0}'' をアンドゥできません。なぜならレイヤ ''{1}'' はもうないか"
+#~ "らです。"
 
 #~ msgid "Footway"
@@ -34468,5 +35348,4 @@
 #~ msgstr "OSMから参照をダウンロードします..."
 
-#, java-format
 #~ msgid "Parameter ''{0}'' must not be null."
 #~ msgstr "パラメータ ''{0}'' はヌルであってはなりません。"
@@ -34475,5 +35354,4 @@
 #~ msgstr "JOSMオンラインヘルプからのみヘルプページを編集できます。"
 
-#, java-format
 #~ msgid "Object id > 0 expected. Got {0}"
 #~ msgstr "オブジェクト ID > 0 が期待されています。入力値: {0}"
@@ -34485,5 +35363,4 @@
 #~ msgstr "外部ヘルプブラウザの起動に失敗"
 
-#, java-format
 #~ msgid "Id > 0 required, got {0}"
 #~ msgstr "ID > 0 が必須です。入力値 {0}"
@@ -34493,13 +35370,10 @@
 #~ msgstr "クリックしてリレーションエディタに戻り、リレーション編集を再開"
 
-#, java-format
 #~ msgid "Uploading {0} objects ..."
 #~ msgstr "{0} オブジェクトをアップロード中 ..."
 
-#, java-format
 #~ msgid "Parameter ''{0}'' must not be empty"
 #~ msgstr "パラメータ ''{0}'' は空ではダメです"
 
-#, java-format
 #~ msgid "Illegal double value ''{0}''"
 #~ msgstr "不正なダブル値 ''{0}''"
@@ -34509,10 +35383,11 @@
 
 #~ msgid "At least one object to delete requird, got empty collection"
-#~ msgstr "削除するオブジェクトが少なくともひとつは必要です、空のコレクションを受け取りました"
+#~ msgstr ""
+#~ "削除するオブジェクトが少なくともひとつは必要です、空のコレクションを受け取"
+#~ "りました"
 
 #~ msgid "User with the same uid but different name found"
 #~ msgstr "同じuidで異なる名前のユーザが見つかりました"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
 #~ msgstr "パラメータ ''{0}'' > 0 が期待されています。入力値 {1}"
@@ -34521,5 +35396,4 @@
 #~ msgstr "入力された緯度/経度のノードを作成できませんでした。"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' > 0 expected. Got {1}."
 #~ msgstr "パラメータ ''{0}'' > 0 が期待されています。入力値 {1}."
@@ -34528,5 +35402,4 @@
 #~ msgstr "利用可能な翻訳を探しています ..."
 
-#, java-format
 #~ msgid "{0} Plugin successfully downloaded."
 #~ msgid_plural "{0} Plugins successfully downloaded."
@@ -34536,17 +35409,13 @@
 #~ msgstr "JOSMを再起動してください。"
 
-#, java-format
 #~ msgid "Expected array of length 4, got {0}"
 #~ msgstr "長さ4の配列が期待されています、入力値{0}"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
 #~ msgstr "パラメータ ''{0}'' > 0.0 が期待されています。入力値 {1}"
 
-#, java-format
 #~ msgid "Failed to load load resource ''{0}''. Error is {1}"
 #~ msgstr "リソース ''{0}''のロードに失敗しました。エラー内容 {1}"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' >= 0 expected, got {1}"
 #~ msgstr "パラメータ ''{0}'' >= 0 が期待されています、入力値 {1}"
@@ -34555,5 +35424,4 @@
 #~ msgstr "あなたのOSMアカウントのパスワードを入力してください"
 
-#, java-format
 #~ msgid "Incorrect value of changeset operator: {0}. Number is expected."
 #~ msgstr "変更セット演算子の不正な値: {0}。 数値が期待されています。"
@@ -34562,35 +35430,35 @@
 #~ msgstr "tags演算子用のパラメータ数値誤り。"
 
-#, java-format
 #~ msgid ""
-#~ "Incorrect value of tags operator: {0}. Tags operator expects number of tags "
-#~ "or range, for example tags:1 or tags:2-5"
-#~ msgstr "tags演算子の不正な値: {0}。 tags 演算子はタグ数または範囲が期待されています、例 tags:1 または tags:2-5"
-
-#, java-format
+#~ "Incorrect value of tags operator: {0}. Tags operator expects number of "
+#~ "tags or range, for example tags:1 or tags:2-5"
+#~ msgstr ""
+#~ "tags演算子の不正な値: {0}。 tags 演算子はタグ数または範囲が期待されていま"
+#~ "す、例 tags:1 または tags:2-5"
+
 #~ msgid "id in parameter ''{0}'' > 0 expected, got {1}."
 #~ msgstr "パラメータ ''{0}'' 中のID > 0 が期待されています、入力値 {1}."
 
-#, java-format
 #~ msgid "Incorrect value of version operator: {0}. Number is expected."
 #~ msgstr "バージョン演算子の不正な値: {0}。数値が期待されています。"
 
-#, java-format
 #~ msgid ""
 #~ "The server reported that the current changset was closed.<br>This is most "
-#~ "likely because the changesets size exceeded the max. size<br>of {0} objects "
-#~ "on the server ''{1}''."
+#~ "likely because the changesets size exceeded the max. size<br>of {0} "
+#~ "objects on the server ''{1}''."
 #~ msgstr ""
-#~ "サーバより、編集中の変更セットがクローズしたと通知されました。<br>おそらく、変更セットのサイズが上限を超えています。<br>{0} "
-#~ "個のオブジェクトがサーバにあります。\"{1}\"。"
+#~ "サーバより、編集中の変更セットがクローズしたと通知されました。<br>おそら"
+#~ "く、変更セットのサイズが上限を超えています。<br>{0} 個のオブジェクトがサー"
+#~ "バにあります。\"{1}\"。"
 
 #~ msgid "Create non-audio markers when reading GPX."
 #~ msgstr "GPXを読み込むときにオーディオではないマーカーを作成"
 
-#, java-format
 #~ msgid ""
-#~ "Warning: ignoring changeset id {0} for new object with external id {1} and "
-#~ "internal id {2}"
-#~ msgstr "警告: 新しい外部ID{1}と内部ID{2} があるため、変更セットID {0} を無視します。"
+#~ "Warning: ignoring changeset id {0} for new object with external id {1} "
+#~ "and internal id {2}"
+#~ msgstr ""
+#~ "警告: 新しい外部ID{1}と内部ID{2} があるため、変更セットID {0} を無視しま"
+#~ "す。"
 
 #~ msgid "Errors during Download"
@@ -34603,5 +35471,7 @@
 #~ "Failed to add an OAuth authentication header. There is currently no OAuth "
 #~ "Access Token configured."
-#~ msgstr "OAuth 認証ヘッダのの追加に失敗しました。OAuth 通信トークンは設定していません。"
+#~ msgstr ""
+#~ "OAuth 認証ヘッダのの追加に失敗しました。OAuth 通信トークンは設定していませ"
+#~ "ん。"
 
 #~ msgctxt "changeset.open"
@@ -34609,12 +35479,11 @@
 #~ msgstr "開く"
 
-#, java-format
 #~ msgid "Expected integer value > 0 for parameter ''{0}'', got ''{1}''"
-#~ msgstr "パラメータ ''{0}'' には整数値 > 0 が期待されています、入力値 ''{1}''"
-
-#, java-format
+#~ msgstr ""
+#~ "パラメータ ''{0}'' には整数値 > 0 が期待されています、入力値 ''{1}''"
+
 #~ msgid ""
-#~ "Warning: Failed to retrieve user infos for the current JOSM user. Exceptions "
-#~ "was: {0}"
+#~ "Warning: Failed to retrieve user infos for the current JOSM user. "
+#~ "Exceptions was: {0}"
 #~ msgstr "警告: 現在のJOSMユーザ用のユーザ情報の参照に失敗。例外コード: {0}"
 
@@ -34632,7 +35501,7 @@
 
 #~ msgid "<html>Cannot open directory.<br>Please select a file!</html>"
-#~ msgstr "<html>ディレクトリを開けません。<br>ファイルを選択してください！</html>"
-
-#, java-format
+#~ msgstr ""
+#~ "<html>ディレクトリを開けません。<br>ファイルを選択してください！</html>"
+
 #~ msgid "Node {0} cannot be added to the way because it was deleted"
 #~ msgstr "ノード {0} は削除済みなのでウェイに追加できません"
Index: /applications/editors/josm/i18n/po/nb.po
===================================================================
--- /applications/editors/josm/i18n/po/nb.po	(revision 21970)
+++ /applications/editors/josm/i18n/po/nb.po	(revision 21971)
@@ -8,7 +8,7 @@
 "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-13 13:19+0000\n"
-"Last-Translator: Skippern <Unknown>\n"
+"POT-Creation-Date: 2010-06-23 22:47+0200\n"
+"PO-Revision-Date: 2010-06-18 00:50+0000\n"
+"Last-Translator: Stian Ellingsen <stiell@gmail.com>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-06-15 16:18+0000\n"
+"X-Launchpad-Export-Date: 2010-06-23 20:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -23,5 +23,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
@@ -93,5 +93,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
@@ -222,5 +222,5 @@
 #, java-format
 msgid "Click to continue and to open {0} browsers"
-msgstr ""
+msgstr "Klikk for å fortsette og åpne {0} nettlesere"
 
 #. Strings in JFileChooser
@@ -248,5 +248,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
@@ -269,5 +269,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
@@ -275,6 +275,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
@@ -283,4 +285,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
@@ -295,5 +299,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100
 msgid "Click to abort launching external browsers"
-msgstr ""
+msgstr "Klikk for å avbryte åpningen av eksterne nettlesere"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132
@@ -318,7 +322,9 @@
 #, java-format
 msgid ""
-"<html>There are no layers the source layer<br>''{0}''<br>could be merged "
-"to.</html>"
-msgstr ""
+"<html>There are no layers the source layer<br>''{0}''<br>could be merged to."
+"</html>"
+msgstr ""
+"<html>Det finnes ingen lag som kildelaget <br>''{0}''<br> kan sammenføyes "
+"med.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:81
@@ -341,9 +347,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
@@ -403,4 +409,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
@@ -440,5 +447,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 "Informasjon"
@@ -641,6 +648,6 @@
 "three nodes."
 msgstr ""
-"Venligst velg akkurat to eller tre noder, eller en veg med akkurat to eller "
-"tre noder."
+"Velg nøyaktig to eller tre noder, eller en linje med nøyaktig to eller tre "
+"noder."
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
@@ -650,5 +657,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
@@ -663,5 +670,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 "Slett"
@@ -711,5 +718,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:38
 msgid "Download OSM object by ID."
-msgstr ""
+msgstr "Last ned OSM-objekter via ID."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:39
@@ -779,5 +786,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:30
 msgid "Download parent ways/relations..."
-msgstr ""
+msgstr "Last ned overordnede linjer/relasjoner …"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29
@@ -897,5 +904,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:126
 msgid "Please select at least one closed way that should be joined."
-msgstr ""
+msgstr "Velg minst én lukket linje som skal sammenføyes."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:132
@@ -910,4 +917,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 ""
@@ -918,4 +926,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 ""
@@ -939,5 +948,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
 msgid "Delete Ways that are not part of an inner multipolygon"
-msgstr "Slette indre linjer som ikke er del av multipolygon (relasjoner)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
@@ -958,6 +967,4 @@
 "verify no errors have been introduced."
 msgstr ""
-"Noen linjer er medlem i relasjoner som er endret. Sjekk at ingen feil har "
-"oppstått."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303
@@ -979,5 +986,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606
 msgid "Join Areas: Remove Short Ways"
-msgstr "Slå sammen arealer: fjern korte linjer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622
@@ -1323,5 +1330,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:148
 msgid "Selection must consist only of ways and nodes."
-msgstr ""
+msgstr "Utvalget må bestå av kun linjer og noder."
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:188
@@ -1467,6 +1474,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
@@ -1493,4 +1500,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
@@ -1499,6 +1508,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 "Feil"
@@ -1515,5 +1524,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45
 msgid "Please select at least one way."
-msgstr "Velg minst én linje"
+msgstr "Velg minst én linje."
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75
@@ -1613,6 +1622,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 "Vis statusrapport med informasjon for feilsøking"
 
@@ -1648,8 +1656,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 "Ja, slett noder"
 
 #: ../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 "Slette noder utenfor nedlastede data-områder"
@@ -1658,5 +1668,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 "Nei, avbryt"
@@ -1664,16 +1675,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 "Avbryt operasjon"
 
 #: ../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 "Vil du slette dem uansett?"
 
 #: ../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 "Slette node utenfor data-områder?"
 
 #: ../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 "Velg minst én linje å forenkle."
@@ -1682,30 +1698,36 @@
 #: ../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 "Ja"
 
 #: ../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 "Forenkle alle valgte veier?"
+msgstr "Forenkle alle valgte linjer"
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:126
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:89
 #, java-format
 msgid ""
 "The selection contains {0} ways. Are you sure you want to simplify them all?"
-msgstr ""
+msgstr "Utvalget inneholder {0} linjer. Vil du virkelig forenkle disse?"
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:129
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:89
 msgid "Simplify ways?"
-msgstr "Forenkle veier?"
+msgstr "Forenkle linjer?"
 
 #: ../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"
 msgid_plural "Simplify {0} ways"
-msgstr[0] "Forenkle {0} vei"
-msgstr[1] "Forenkle {0} veier"
+msgstr[0] "Forenkle {0} linje"
+msgstr[1] "Forenkle {0} linjer"
 
 #: ../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)"
@@ -1740,6 +1762,8 @@
 "There is more than one way using the nodes you selected. Please select the "
 "way also."
-msgstr[0] "Mer enn én linje bruker den  valgte noden. Velg flere linjer."
-msgstr[1] "Mer enn én linje bruker de valgte nodene. Velg flere linjer."
+msgstr[0] ""
+"Mer enn én linje bruker den  valgte noden. Velg aktuell linje i tillegg."
+msgstr[1] ""
+"Mer enn én linje bruker de valgte nodene. Velg aktuell linje i tillegg."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
@@ -1756,5 +1780,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
 msgid "You must select two or more nodes to split a circular way."
-msgstr "Velg to eller fler noder for å splitte sirkelformet linje."
+msgstr "Velg to eller flere noder for å splitte sirkelformet linje."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
@@ -1763,5 +1787,5 @@
 "middle of the way.)"
 msgstr ""
-"Linje kan ikke splittes i valgt node. (Tips: velg noder mot midten av "
+"Linje kan ikke splittes i valgte noder. (Tips: velg noder mot midten av "
 "linjen.)"
 
@@ -1835,6 +1859,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 "– En node som er brukt av flere linjer, og en av linjene, eller"
 
@@ -1904,9 +1927,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)"
@@ -1923,5 +1946,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
@@ -1985,5 +2008,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 "Ingen endringer å laste opp."
@@ -2001,14 +2023,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 ""
@@ -2263,5 +2285,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
@@ -2378,9 +2400,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
 msgid ""
-"Drag play head and release near track to play audio from there; "
-"SHIFT+release to synchronize audio at that point."
-msgstr ""
-"Dra og slipp avspillingsmarkør der du vil avspilling skal starte; "
-"Shift+slipp synkroniserer audio i dette punktet."
+"Drag play head and release near track to play audio from there; SHIFT"
+"+release to synchronize audio at that point."
+msgstr ""
+"Dra og slipp avspillingsmarkør der du vil avspilling skal starte; Shift"
+"+slipp synkroniserer audio i dette punktet."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
@@ -2517,5 +2539,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."
@@ -2592,5 +2614,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
-msgstr ""
+msgstr "<b>oneway?</b> – oneway=yes, true, 1 eller on"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
@@ -2605,6 +2627,5 @@
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
-msgstr ""
-"<b>type:</b> – type objekt (<b>node</b>, <b>way</b>, <b>relation</b>)"
+msgstr "<b>type:</b> – type objekt (<b>node</b>, <b>way</b>, <b>relation</b>)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
@@ -2634,6 +2655,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 ""
 
@@ -2856,6 +2877,5 @@
 #, java-format
 msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr ""
-"{0} noder i linje {1} overstiger maksimalt antall tillatte noder, {2}"
+msgstr "{0} noder i linje {1} overstiger maksimalt antall tillatte noder, {2}"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
@@ -2902,10 +2922,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
@@ -2923,10 +2947,10 @@
 #, java-format
 msgid "Add way {0}"
-msgstr ""
+msgstr "Legg til linje {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
 #, java-format
 msgid "Add relation {0}"
-msgstr ""
+msgstr "Legg til relasjon {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:58
@@ -2940,10 +2964,10 @@
 #, java-format
 msgid "Change node {0}"
-msgstr ""
+msgstr "Endre node {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:56
 #, java-format
 msgid "Change way {0}"
-msgstr ""
+msgstr "Endre linje {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:57
@@ -2965,5 +2989,5 @@
 #, java-format
 msgid "Remove \"{0}\" for way ''{1}''"
-msgstr ""
+msgstr "Fjern «{0}» for linje «{1}»"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
@@ -2980,5 +3004,5 @@
 #, java-format
 msgid "Set {0}={1} for way ''{2}''"
-msgstr ""
+msgstr "Sett {0}={1} for linje «{2}»"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
@@ -3027,5 +3051,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
@@ -3060,5 +3084,5 @@
 #, java-format
 msgid "Delete way {0}"
-msgstr ""
+msgstr "Slett linje {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
@@ -3085,6 +3109,6 @@
 msgid "Delete {0} way"
 msgid_plural "Delete {0} ways"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Slett {0} linje"
+msgstr[1] "Slett {0} linjer"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
@@ -3105,11 +3129,11 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231
 msgid ""
-"You are about to delete nodes outside of the area you have "
-"downloaded.<br>This can cause problems because other objects (that you do "
-"not see) might use them.<br>Do you really want to delete?"
+"You are about to delete nodes outside of the area you have downloaded."
+"<br>This can cause problems because other objects (that you do not see) "
+"might use them.<br>Do you really want to delete?"
 msgstr ""
 "Du er i ferd med å slette noder utenfor nedlastet område.<br>Dette kan skape "
-"problemer fordi de kan være i bruk av andre objekter (som du ikke kan se nå) "
-".<br>Er du sikker på at du vil slette nodene?"
+"problemer fordi de kan være i bruk av andre objekter (som du ikke kan se "
+"nå) .<br>Er du sikker på at du vil slette nodene?"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
@@ -3151,14 +3175,14 @@
 msgid "Move {0} node"
 msgid_plural "Move {0} nodes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:101
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:119
+msgstr[0] "Flytt {0} node"
+msgstr[1] "Flytt {0} noder"
+
+#: ../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"
@@ -3167,5 +3191,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 #, java-format
 msgid ""
@@ -3176,5 +3200,5 @@
 "er {1}."
 
-#: ../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}"
@@ -3227,5 +3251,5 @@
 #, java-format
 msgid "Resolve version conflict for way {0}"
-msgstr ""
+msgstr "Løs versjonskonflikt for linje {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
@@ -3237,5 +3261,5 @@
 #, java-format
 msgid "Resolve conflicts in node list of way {0}"
-msgstr ""
+msgstr "Løs konflikt i nodelisten til linje {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:66
@@ -3382,6 +3406,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 ""
 
@@ -3464,5 +3488,5 @@
 #. *
 #. * the decimal format 999.999
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3471,5 +3495,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3478,5 +3502,5 @@
 #. *
 #. * coordinates East/North
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3523,4 +3547,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}"
@@ -3532,29 +3559,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 ""
 
@@ -3633,19 +3654,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 ""
@@ -3654,5 +3675,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 "
@@ -3660,5 +3681,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 ""
@@ -3714,6 +3735,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 ""
 
@@ -3728,5 +3748,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 "valgt"
@@ -3751,5 +3771,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21
 msgid "untagged way"
-msgstr "Llinje uten egenskaper"
+msgstr "linje uten egenskaper"
 
 #. dark green
@@ -3890,6 +3910,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 ""
 
@@ -3960,5 +3979,5 @@
 #. color tiger_data
 #. </rule>
-#. 
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -3968,5 +3987,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -3975,5 +3994,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -3982,5 +4001,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -3989,5 +4008,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -3996,5 +4015,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4003,9 +4022,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--annotation tags -->
-#. 
+#.
 #. <!--"work in progress" tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="building"/>
@@ -4014,5 +4033,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 "bygning"
@@ -4099,5 +4118,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
@@ -4148,6 +4167,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
-msgstr ""
-"Endre vinduets størrelse til oppgitt geometri  (format: BREDDExHØYDE)"
+msgstr "Endre vinduets størrelse til oppgitt geometri  (format: BREDDExHØYDE)"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
@@ -4187,6 +4205,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "If specified, reset the configuration instead of reading it."
-msgstr ""
-"Hvis angitt, gå til standardinnstillinger i stedet for å lese dem inn."
+msgstr "Hvis angitt, gå til standardinnstillinger i stedet for å lese dem inn."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
@@ -4325,5 +4342,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
@@ -4332,4 +4349,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
@@ -4530,5 +4548,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
@@ -4567,6 +4585,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 ""
 
@@ -4597,5 +4615,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"
@@ -4604,5 +4622,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"
@@ -4611,5 +4629,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"
@@ -4686,5 +4704,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191
 msgid "Pending conflicts in the node list of this way"
-msgstr "Gjenværende konflikter i denne veiens nodeliste"
+msgstr "Gjenværende konflikter i denne linjas nodeliste"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196
@@ -4839,6 +4857,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 ""
 "Kopier valgte elementer på tjeneren til slutten av lista over sammenslåtte "
@@ -4924,6 +4941,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their "
-"entries.</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 "<html>Trykk <strong>{0}</strong> for å begynne sammenslåingen av lokal- og "
@@ -4933,6 +4950,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their "
-"entries.</html>"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
+"html>"
 msgstr ""
 "<html>Trykk <strong>{0}</strong> for å avslutte sammenslåingen av lokal- og "
@@ -4980,15 +4997,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
-msgstr ""
-"Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando."
+msgstr "Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464
 #, java-format
 msgid ""
-"<html>An error occurred while communicating with the server<br>Details: "
-"{0}</html>"
-msgstr ""
-"<html>Det oppstod en feil under kommunikasjon med tjeneren.<br>Detaljer: "
-"{0}</html>"
+"<html>An error occurred while communicating with the server<br>Details: {0}</"
+"html>"
+msgstr ""
+"<html>Det oppstod en feil under kommunikasjon med tjeneren.<br>Detaljer: {0}"
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
@@ -5178,6 +5194,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:121
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
-msgstr ""
-"Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando."
+msgstr "Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35
@@ -5209,10 +5224,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"
@@ -5221,10 +5238,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
@@ -5306,4 +5325,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 "ingen"
@@ -5355,5 +5375,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50
 msgid "Tags from ways"
-msgstr ""
+msgstr "Egenskaper fra linjer"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51
@@ -5496,5 +5516,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
 msgid "Orig. Way"
-msgstr ""
+msgstr "Orig. linje"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
@@ -5520,7 +5540,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 ""
 
@@ -5545,6 +5565,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 ""
 
@@ -5590,5 +5609,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
@@ -5652,5 +5671,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238
 msgid "Close anyway"
-msgstr ""
+msgstr "Lukk likevel"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239
@@ -5661,10 +5680,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 ""
 
@@ -5687,5 +5705,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
@@ -5693,5 +5711,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 "Legg til"
@@ -5740,5 +5758,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 "Historikk"
@@ -5958,10 +5976,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 ""
@@ -7416,6 +7434,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 ""
 
@@ -7439,8 +7457,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 ""
 
@@ -7560,9 +7578,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 "Tilføy egenskaper"
 
-#: ../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."
@@ -7571,23 +7589,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 "<different>"
 
-#: ../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 "Endre verdier?"
 
-#: ../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"
@@ -7596,5 +7614,5 @@
 msgstr[1] "Endre egenskap på inntil {0} objekt"
 
-#: ../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."
@@ -7603,77 +7621,77 @@
 msgstr[1] "Dette vil endre opptil {0} objekt."
 
-#: ../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 "Velg en nøkkel"
 
-#: ../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 "Velg en verdi"
 
-#: ../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 "Velg de objekter, du vil rette egenskaper for."
 
-#: ../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 "Egenskaper/medlemsskaper"
 
-#: ../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 "Egenskaper for valgte objekt."
 
 #. 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 "Medlem av"
 
-#: ../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 "Egenskaper: {0} / Medlemskap: {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 "Egenskaper / Medlemskap"
 
-#: ../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 "Skift relasjon"
 
-#: ../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 "Slett fra relasjon"
 
-#: ../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 "Vil du slette utvalget fra relasjon {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 "Fjern den valgte nøkkel i alle objekt"
 
-#: ../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 "DSlett egenskaper"
 
-#: ../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 "Tilføy et nytt nøkkel/verdi-sett til alle objekter"
 
-#: ../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 "Rett verdien for den valgte nøkkel for alle objekter"
 
-#: ../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 ""
@@ -7788,6 +7806,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 ""
 
@@ -7805,6 +7823,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 ""
 
@@ -7959,7 +7977,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 ""
 
@@ -8294,7 +8311,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 ""
 
@@ -8435,6 +8451,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 ""
 
@@ -8444,6 +8460,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 ""
 
@@ -8529,5 +8545,5 @@
 #, java-format
 msgid "History for way {0}"
-msgstr ""
+msgstr "Historikk for linje {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
@@ -8542,6 +8558,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:272
 msgid "History not initialized yet. Failed to set reference primitive."
-msgstr ""
-"Historikk er ikke klargjort ennå. Klarte ikke sette referanseelement."
+msgstr "Historikk er ikke klargjort ennå. Klarte ikke sette referanseelement."
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:274
@@ -8562,6 +8577,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302
 msgid "History not initialized yet. Failed to set current primitive."
-msgstr ""
-"Historikk er ikke klargjort ennå. Klarte ikke sette gjeldende element."
+msgstr "Historikk er ikke klargjort ennå. Klarte ikke sette gjeldende element."
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307
@@ -8587,5 +8601,5 @@
 #, java-format
 msgid "Loading history for way {0}"
-msgstr ""
+msgstr "Laster historikk for linje {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:188
@@ -8615,5 +8629,5 @@
 #, java-format
 msgid "Way {0}"
-msgstr ""
+msgstr "Linje {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
@@ -8705,5 +8719,5 @@
 #, java-format
 msgid "Synchronize way {0} only"
-msgstr ""
+msgstr "Synkroniser kun linje {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96
@@ -8723,17 +8737,16 @@
 "version of one<br>of your nodes, ways, or relations.<br>The conflict is "
 "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click "
-"<strong>{4}</strong> to synchronize the conflicting primitive only.<br>Click "
-"<strong>{5}</strong> to synchronize the entire local dataset with the "
-"server.<br>Click <strong>{6}</strong> to abort and continue "
-"editing.<br></html>"
-msgstr ""
-"<html>Upplasting <strong>feilet</strong> fordi tjeneren har en nyere versjon "
+"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
+"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
+"strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{6}</strong> to abort and continue editing.<br></html>"
+msgstr ""
+"<html>Opplasting <strong>feilet</strong> fordi tjeneren har en nyere versjon "
 "av en<br>lokal node, linje eller relasjon.<br>Konflikten er forårsaket av "
 "<strong>{0}</strong> med ID <strong>{1}</strong>,<br>tjeneren har versjon "
 "{2}, lokal versjon er {3}.<br><br>Trykk <strong>{4}</strong> for å "
 "synkronisere kun konfliktelementet.<br>Trykk <strong>{5}</strong> for å "
-"synkronisere hele det lokale datasettet med tjeneren.<br>Trykk "
-"<strong>{6}</strong> for å gå tilbake og fortsette å redigere.<br></html>"
+"synkronisere hele det lokale datasettet med tjeneren.<br>Trykk <strong>{6}</"
+"strong> for å gå tilbake og fortsette å redigere.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
@@ -8747,14 +8760,12 @@
 msgid ""
 "<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click "
-"<strong>{0}</strong> to synchronize the entire local dataset with the "
-"server.<br>Click <strong>{1}</strong> to abort and continue "
-"editing.<br></html>"
+"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
+"</strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{1}</strong> to abort and continue editing.<br></html>"
 msgstr ""
 "<html>Opplasting <strong>feilet</strong> fordi tjeneren har en nyere versjon "
 "av en node, linje ellerrelasjon.<br><br>Trykk <strong>{0}</strong> for å "
-"synkronisere hele det lokale datasettet med tjeneren.<br>Trykk "
-"<strong>{1}</strong> for å avbryte operasjonen og fortsette å "
-"redigere.<br></html>"
+"synkronisere hele det lokale datasettet med tjeneren.<br>Trykk <strong>{1}</"
+"strong> for å avbryte operasjonen og fortsette å redigere.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194
@@ -8777,5 +8788,5 @@
 #, java-format
 msgid "Click to download all parent ways for node {0}"
-msgstr ""
+msgstr "Trykk for å laste ned alle linjer overordnet node {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222
@@ -8999,5 +9010,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 ""
@@ -9005,6 +9016,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 ""
 
@@ -9089,6 +9099,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] ""
@@ -9102,6 +9112,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 "
@@ -9327,5 +9337,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9351,6 +9361,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 ""
 
@@ -9405,6 +9414,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 ""
 
@@ -9458,7 +9467,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 ""
 
@@ -9468,5 +9477,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9482,5 +9491,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..."
@@ -9491,6 +9500,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 ""
 
@@ -9708,7 +9716,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 ""
 
@@ -9734,7 +9742,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 ""
 
@@ -9798,6 +9806,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 ""
 "<html>Opplasting av ubehandlede GPS-data som kortdata betraktes som "
@@ -9981,6 +9989,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 ""
 
@@ -10040,10 +10048,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
 msgid ""
-"<html>Take a photo of your GPS receiver while it displays the "
-"time.<br>Display that photo here.<br>And then, simply capture the time you "
-"read on the photo and select a timezone<hr></html>"
-msgstr ""
-"<html>Ta et bilde av din GPS mottaker når den viser tid.<br>Vis bildet "
-"her.<br>Skriv inn tidspunktet og velg tidssone<hr></html>"
+"<html>Take a photo of your GPS receiver while it displays the time."
+"<br>Display that photo here.<br>And then, simply capture the time you read "
+"on the photo and select a timezone<hr></html>"
+msgstr ""
+"<html>Ta et bilde av din GPS mottaker når den viser tid.<br>Vis bildet her."
+"<br>Skriv inn tidspunktet og velg tidssone<hr></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
@@ -10629,6 +10637,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 ""
 
@@ -10650,8 +10658,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 ""
 
@@ -10771,6 +10779,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 ""
 
@@ -10880,6 +10888,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 ""
 
@@ -11013,8 +11020,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 ""
 
@@ -11097,8 +11104,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 ""
 
@@ -11125,7 +11132,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 ""
 
@@ -11178,5 +11185,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 "Velg raden som skal slettes"
@@ -11474,5 +11481,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Only on the head of a way."
-msgstr "Bare ved enden af linjen."
+msgstr "Bare ved enden av linja."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
@@ -11546,6 +11553,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 ""
 "Tegn retningspiler ved hjelp av tabellopslag i stedet for kompleks matematik."
@@ -11556,6 +11562,5 @@
 "Do not draw arrows if they are not at least this distance away from the last "
 "one."
-msgstr ""
-"Tegn ikke piler uten at det er minst denne avstand fra forrige punkt."
+msgstr "Tegn ikke piler uten at det er minst denne avstand fra forrige punkt."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
@@ -11587,5 +11592,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 msgid "Allows to tune the track coloring for different average speeds."
-msgstr "Tillater å justere fargen etter forskjellig gjennomsnitt hastighet."
+msgstr "Tillater å justere fargen etter gjennomsnittsfarten."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
@@ -11608,6 +11613,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 "Bruk udjevning på kartvisningen for et mere glatt utseende."
 
@@ -11679,5 +11683,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 "Benytt innebygd standardverdier"
@@ -11697,6 +11701,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>:"
@@ -11821,6 +11824,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 ""
 
@@ -11833,9 +11836,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 ""
 
@@ -12134,6 +12137,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 ""
 
@@ -12144,5 +12147,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 ""
@@ -12152,18 +12155,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 ""
@@ -12172,5 +12175,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 ""
@@ -12179,5 +12182,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 ""
@@ -12186,9 +12189,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 "Meny for sortering av innstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
 msgid "Tagging Presets"
 msgstr "Objektmal"
@@ -12254,5 +12257,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
 msgid "Always update withouth asking"
-msgstr ""
+msgstr "Oppdater alltid uten å spørre"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:80
@@ -12297,6 +12300,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 ""
 
@@ -12318,6 +12321,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 ""
 
@@ -12395,6 +12398,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 ""
 
@@ -12410,6 +12412,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 ""
 
@@ -12503,6 +12504,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 ""
 
@@ -12635,4 +12636,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 "Endre egenskaper"
@@ -12798,5 +12800,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
@@ -12816,5 +12818,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}''"
@@ -12981,6 +12983,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 ""
 
@@ -13099,10 +13100,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 "Uventet ID-format i svar fra tjener – leste «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:278
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -13110,69 +13111,69 @@
 msgstr "Uventet format for ny versjon av endret element «{0}»: «{1}»"
 
-#: ../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 "Lukker endringssett …"
 
-#: ../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 "Ingen base med rettinger tilstede for opplasting"
 
-#: ../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}."
@@ -13262,6 +13263,5 @@
 "Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
 msgstr ""
-"ugyldig verdi for obligatorisk attributt «{0}» av type «boolean» – leste "
-"«{1}»"
+"ugyldig verdi for obligatorisk attributt «{0}» av type «boolean» – leste «{1}»"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:150
@@ -13292,4 +13292,6 @@
 "''create'', ''modify'', or ''delete''."
 msgstr ""
+"Ugyldig dokumentstruktur: Fant node, linje eller relasjon utenfor «create», "
+"«modify» eller «delete»."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:259
@@ -13357,4 +13359,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})"
@@ -13374,6 +13377,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 ""
 
@@ -13401,6 +13404,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 ""
 
@@ -13426,5 +13429,5 @@
 #, java-format
 msgid "Deleted way {0} contains nodes"
-msgstr ""
+msgstr "Slettet linje {0} inneholder noder"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
@@ -13442,6 +13445,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 ""
 
@@ -13561,4 +13563,5 @@
 "Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
 msgstr ""
+"Linje med ekstern ID «{0}» inkluderer manglende node med ekstern ID «{1}»."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
@@ -13566,5 +13569,5 @@
 #, java-format
 msgid "Deleted node {0} is part of way {1}"
-msgstr ""
+msgstr "Slettet node {0} er del av linje {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
@@ -13613,5 +13616,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:142
 msgid "Downloading referring ways ..."
-msgstr ""
+msgstr "Laster ned refererende linjer …"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:180
@@ -13709,5 +13712,5 @@
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
-msgstr ""
+msgstr "{0} % ({1} / {2}), {3} gjenstår. Laster opp linje «{4}» (ID: {5})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
@@ -13876,6 +13879,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 ""
 
@@ -14010,6 +14013,5 @@
 msgid ""
 "An unexpected exception occurred that may have come from the ''{0}'' plugin."
-msgstr ""
-"Det oppstod en uventet feil som kan stamme fra programtillegget «{0}»."
+msgstr "Det oppstod en uventet feil som kan stamme fra programtillegget «{0}»."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
@@ -14085,6 +14087,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 ""
 
@@ -14151,5 +14152,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"
@@ -14232,6 +14233,6 @@
 msgid ""
 "<html>Uploading to the server <strong>failed</strong> because your "
-"current<br>dataset violates a precondition.<br>The error message "
-"is:<br>{0}</html>"
+"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
+"html>"
 msgstr ""
 "<html>Opplasting til tjeneren <strong>feilet</strong> fordi nåværende "
@@ -14241,7 +14242,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 ""
 
@@ -14249,7 +14250,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 ""
 
@@ -14257,8 +14258,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 ""
 
@@ -14278,7 +14279,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 ""
 
@@ -14347,7 +14348,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 ""
 
@@ -14359,7 +14359,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 ""
 
@@ -14391,6 +14391,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 ""
 
@@ -14523,5 +14523,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
-msgstr "Lag et Rutenett av linjer"
+msgstr "Lag et rutenett av linjer"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
@@ -14737,5 +14737,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:238
 msgid "Convert way to individual house numbers."
-msgstr ""
+msgstr "Konverter linje til individuelle husnummer."
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:307
@@ -14899,6 +14899,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>"
@@ -14925,6 +14925,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"
@@ -14962,6 +14962,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"
@@ -14977,7 +14977,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"
@@ -15028,9 +15028,29 @@
 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 "Bygninger"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#, fuzzy
+msgid "Rotate crosshair"
+msgstr "Roter med klokken"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#, fuzzy
+msgid "Advanced settings"
+msgstr "Avanserte innstillinger"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#, fuzzy
+msgid "Building tag:"
+msgstr "Bygning"
+
+#: ../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"
@@ -15039,35 +15059,45 @@
 #: ../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 "Offentlig bygning"
+
+#: ../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
+#, fuzzy
+msgid "Advanced..."
+msgstr "vanskelig"
+
+#: ../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 ""
 
@@ -15246,7 +15276,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--waterway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15256,5 +15286,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15264,5 +15294,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15278,5 +15308,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15286,5 +15316,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15292,8 +15322,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 "vann"
@@ -15315,5 +15345,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15322,5 +15352,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15329,5 +15359,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15336,5 +15366,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15343,5 +15373,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15350,10 +15380,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 "adresse"
@@ -15382,17 +15412,14 @@
 #: ../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."
-msgstr ""
-"Et eget programtillegg for fransk Cadastre wms (matrikkel) på "
-"www.cadastre.gouv.fr<BR><BR>Du finner betingelser for bruk her (på fransk): "
-"<br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
+"A special handler of the French cadastre wms at www.cadastre.gouv."
+"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
+"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
+"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
+"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
+"by this plugin."
+msgstr ""
+"Et eget programtillegg for fransk Cadastre wms (matrikkel) på www.cadastre."
+"gouv.fr<BR><BR>Du finner betingelser for bruk her (på fransk): <br><a href="
+"\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html\"> "
 "http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
 "<BR>før du laster inn data med dette programtillegget."
@@ -15405,6 +15432,6 @@
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
-"<html>Verdien på \"source\" er aktivisert ved automatisk "
-"kildeangivelse</html>"
+"<html>Verdien på \"source\" er aktivisert ved automatisk kildeangivelse</"
+"html>"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106
@@ -15831,6 +15858,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 "Blankt lag"
@@ -15923,5 +15950,5 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
 msgid "Splits an area by an untagged way."
-msgstr "Deler et område med en umerket veg."
+msgstr "Deler et område med en umerket linje."
 
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:78
@@ -16016,4 +16043,52 @@
 msgstr "Fant ikke GPX lag"
 
+#: ../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 "Rediger  zoologisk hage"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#, fuzzy
+msgid "Name:"
+msgstr "Navn"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#, fuzzy
+msgid "CmdLine:"
+msgstr "Koordinater:"
+
+#: ../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
+#, fuzzy, java-format
+msgid "Delete tool \"{0}\"?"
+msgstr "Slett linje {0}"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:74
+msgid "Are you sure?"
+msgstr "Er du sikker?"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
+#, fuzzy
+msgid "New tool..."
+msgstr "Ny rolle"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
+#, fuzzy
+msgid "Install"
+msgstr "Industriområde"
+
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
 msgid "Position only"
@@ -16058,5 +16133,5 @@
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:151
 msgid "Disable data logging if speed falls below"
-msgstr "Slå av Data logg når fart kommer under"
+msgstr "Slå av loggføring når fart kommer under"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:177
@@ -16283,5 +16358,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#. 
+#.
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16402,6 +16477,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 ""
 "Maksimalt antall segmenter tillatt i hver opptegnede linje. Standard er 250."
@@ -16424,7 +16498,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 ""
 "Nøyaktighet på Douglas-Peucker linjeforenkling, målt i grader.<br>Lave "
@@ -16674,5 +16747,5 @@
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:94
 msgid "One of the selected ways is already part of another multipolygon."
-msgstr ""
+msgstr "En av de valgte linjene er allerede del av en annen multipolygon."
 
 #. Commit
@@ -16691,9 +16764,9 @@
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:120
 msgid "Multipolygon must consist only of closed ways."
-msgstr ""
+msgstr "Multipolygon må bestå kun av lukkede linjer."
 
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:140
 msgid "You must select at least two ways."
-msgstr ""
+msgstr "Velg minst to linjer."
 
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
@@ -16715,7 +16788,7 @@
 "new server? (Strongly recommended)</html>"
 msgstr ""
-"<html>Openstreetbugs-tillegget bruker den gamle tjeneren på "
-"appspot.com.<br>En ny tjener er tilgjengelig på schokokeks.org.<br>Vil du "
-"bytte til den nye tjeneren? (Anbefalt)</html>"
+"<html>Openstreetbugs-tillegget bruker den gamle tjeneren på appspot.com."
+"<br>En ny tjener er tilgjengelig på schokokeks.org.<br>Vil du bytte til den "
+"nye tjeneren? (Anbefalt)</html>"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:109
@@ -16742,6 +16815,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 "Header inneholder flere verdier og kan ikke kobles til enkelt streng"
 
@@ -16855,6 +16927,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 ""
 
@@ -16906,6 +16977,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 ""
 
@@ -17197,6 +17267,5 @@
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
-msgstr ""
-"Et programtillegg som tillater at JOSM blir styrt av et annet program"
+msgstr "Et programtillegg som tillater at JOSM blir styrt av et annet program"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
@@ -17273,5 +17342,5 @@
 msgstr "Tilbakestill"
 
-#: ../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}"
@@ -17322,4 +17391,43 @@
 msgid "Revert changeset #{0}"
 msgstr ""
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:78
+#, fuzzy
+msgid "Road Sign Plugin"
+msgstr "Laster inn programtillegg"
+
+#: ../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 "Klarte ikke å lese egenskapslista for Objektmaler: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
+#, fuzzy, java-format
+msgid "Error parsing tagging preset from ''{0}'':\n"
+msgstr ""
+"Feil ved oppstart af test {0}:\n"
+" {1}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:104
+#, fuzzy, java-format
+msgid "Sign {0}"
+msgstr "Utvalg: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:111
+#, fuzzy, java-format
+msgid "Additional sign {0}"
+msgstr "Legg til relasjon {0}"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -17416,5 +17524,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:92
 msgid "Speed (Km/h)"
-msgstr "Fart (Km/h)"
+msgstr "Fart (km/t)"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:114
@@ -17425,4 +17533,15 @@
 msgid "Enter weight values"
 msgstr "Gi verdier for vekting"
+
+#: ../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 "Forenkle linje"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
+#, fuzzy
+msgid "Delete unnecessary nodes from an area."
+msgstr "Slett overflødige noder fra en linje."
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
@@ -18100,9 +18219,9 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:82
 msgid "Public Service Vehicles"
-msgstr ""
+msgstr "Offentlig transport"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:83
 msgid "Public service vehicles like buses, tramways, etc."
-msgstr ""
+msgstr "Offentlig transport som buss, trikk osv."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:95
@@ -18152,4 +18271,6 @@
 "''via''."
 msgstr ""
+"Klarte ikke hente OSM-objekt med ID {0} fra datasett {1}. Kan ikke legge til "
+"som «via»."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java:125
@@ -18219,6 +18340,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 ""
 
@@ -18304,8 +18425,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 ""
 
@@ -18359,8 +18480,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 ""
 
@@ -18472,6 +18593,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 ""
 
@@ -18479,6 +18600,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 ""
 
@@ -18769,5 +18890,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:126
 msgid "Crossing ways"
-msgstr "Kryssende veier"
+msgstr "Kryssende linjer"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:79
@@ -18787,5 +18908,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:84
 msgid "Duplicated ways"
-msgstr ""
+msgstr "Doble linjer"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:65
@@ -18797,5 +18918,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:169
 msgid "Delete duplicate ways"
-msgstr ""
+msgstr "Slett doble linjer"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23
@@ -18827,5 +18948,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:134
 msgid "No outer way for multipolygon"
-msgstr ""
+msgstr "Ingen ytre linje i multipolygon"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:151
@@ -19009,6 +19130,5 @@
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
-msgstr ""
-"Denne test sjekker linjer med liknende navn, som kan bety feilstaving."
+msgstr "Denne test sjekker linjer med liknende navn, som kan bety feilstaving."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153
@@ -19134,11 +19254,9 @@
 #: ../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."
-msgstr ""
-"Kildene (URL eller filnavn) for stavekontroll (se "
-"http://wiki.openstreetmap.org/index.php/User:JLS/speller) eller \"tag "
-"checking data files\"."
+"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
+"org/index.php/User:JLS/speller) or tag checking data files."
+msgstr ""
+"Kildene (URL eller filnavn) for stavekontroll (se http://wiki.openstreetmap."
+"org/index.php/User:JLS/speller) eller \"tag checking data files\"."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
@@ -19172,5 +19290,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
 msgid "Looks for nodes or ways with FIXME in any property value."
-msgstr "Søker etter noder eller linjer med FIXME i en egenskapsverdi"
+msgstr "Søker etter noder eller linjer med FIXME i en egenskapsverdi."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:761
@@ -19333,9 +19451,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 "område"
@@ -19376,6 +19494,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:38
 msgid "This test checks for untagged nodes that are not part of any way."
-msgstr ""
-"Sjekker for noder uten egenskaper som heller ikke tilhører noen linje."
+msgstr "Sjekker for noder uten egenskaper som heller ikke tilhører noen linje."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:60
@@ -19413,6 +19530,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:36
 msgid "This test checks the direction of water, land and coastline ways."
-msgstr ""
-"Testen finner linjer som elver, land eller kystlinje med feil retning."
+msgstr "Testen finner linjer som elver, land eller kystlinje med feil retning."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:70
@@ -19433,11 +19549,146 @@
 msgstr "{0}, …"
 
-#: ../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
+#, fuzzy, java-format
+msgid "{0} {1}% of GPS track"
+msgstr "{0} består av {1} GPS spor"
+
+#: ../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 "Importer lyd"
+
+#: ../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 "Fjern"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
+#, fuzzy
+msgid "removes current video from layer"
+msgstr "Fjern foto fra lag"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
+#, fuzzy
+msgid "play/pause"
+msgstr "Spill/Pause"
+
+#: ../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 "bakgrunn"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
+#, fuzzy
+msgid "jumps n sec back"
+msgstr "Hopp tilbake."
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "forward"
+msgstr "Spill av"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "jumps n sec forward"
+msgstr "Neste spor"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
+#, fuzzy
+msgid "faster"
+msgstr "Raskere"
+
+#: ../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 "Saktere"
+
+#: ../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 "Legger inn markører eller Noder på gps posisjon."
+
+#. 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
+#, fuzzy
+msgid "Jump length"
+msgstr "Gå dit"
+
+#: ../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
+#, fuzzy
+msgid "Loop length"
+msgstr "Lengde: "
+
+#: ../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 "lag"
+
+#: ../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 ""
 
@@ -19652,28 +19903,28 @@
 "Dette resulterer i feil koordinater."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
 msgid "Automatic downloading"
 msgstr "Automatisk nedlasting"
 
-#: ../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 "WMS lag ({0}) laster automatisk ned i zoom {1}"
 
-#: ../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 "WMS lag ({0})  laster ned i zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
 #, java-format
 msgid ""
@@ -19684,113 +19935,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 "Last ned synlige kartbilder"
 
-#: ../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 "Du har bestilt for stort område. Zoom inn eller bytt oppløsning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329
 msgid "Change resolution"
 msgstr "Bytt oppløsning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341
 msgid "Reload erroneous tiles"
 msgstr "Last ned kartbilder med feil på nytt"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385
 msgid "Save WMS layer to file"
 msgstr "Lagre WMS lag til fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
 msgid "Save WMS layer"
 msgstr "Lagre WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413
 msgid "Load WMS layer from file"
 msgstr "les inn WMS lag fra fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
 msgid "Load WMS layer"
 msgstr "Last inn WMS-lag"
 
-#: ../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 "Støtter ikke WMS fil versjon;fant {0}, ønsker {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
 msgid "File Format Error"
 msgstr "Feil Fil Format"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449
 msgid "Error loading file"
 msgstr "Feil ved lasting av fil"
 
-#: ../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 "Åpne tomt WMS lag til data fra fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
 msgid "WMS Plugin Preferences"
 msgstr "Innstillinger WMS Programtillegg"
 
-#: ../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 "Rediger liste over WMS-tjenere som vises i WMS-programtillegg"
 
-#: ../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 "Meny Navn"
 
-#: ../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 "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "Menu Name (Default)"
 msgstr "Meny Navn (Standard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "WMS URL (Default)"
 msgstr "WMS URL (Standard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:86
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
 msgid "Enter a menu name and WMS URL"
 msgstr "Gi meny navn og WMS URL"
 
-#: ../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 "Nedlaster:"
@@ -19808,4 +20059,8 @@
 msgstr ""
 
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186
+msgid "Simultaneous connections"
+msgstr ""
+
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10
@@ -19816,7 +20071,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
@@ -19868,8 +20123,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 "skog"
@@ -19886,7 +20141,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--boundary tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -19896,5 +20151,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -19937,5 +20192,5 @@
 #. color boundary
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -19945,5 +20200,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -19953,5 +20208,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -19961,15 +20216,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 "grense"
@@ -19985,5 +20240,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -19992,7 +20247,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--route tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -20002,5 +20257,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -20010,5 +20265,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -20018,5 +20273,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -20026,5 +20281,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -20034,5 +20289,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -20042,5 +20297,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -20050,12 +20305,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 "rute"
@@ -20339,21 +20594,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 "Last ned GPS punkt fra Globalsat dg100 data logger direkte til JOSM"
 
 #. 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 "Bakgrunnslag som viser rutenettet i kartet"
 
 #. 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 "
@@ -20366,10 +20620,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:34
 msgid "Helps vectorizing WMS images."
 msgstr "For vektorisering av  WMS bilder."
 
 #. 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."
@@ -20379,5 +20633,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 "
@@ -20390,15 +20644,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 "
@@ -20407,5 +20661,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 "
@@ -20418,15 +20672,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:48
 msgid "Displays an OpenLayers background image"
 msgstr "Viser bakgrunnsbildet i et åpent lag"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:50
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importerer tema fra OpenStreetBugs"
 
 #. 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"
@@ -20434,5 +20688,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."
@@ -20440,5 +20694,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 "
@@ -20447,5 +20701,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 "
@@ -20456,10 +20710,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "JGoodies Plastic Look and Feel."
 
 #. 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."
@@ -20467,15 +20721,16 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "Let other applications send commands to JOSM."
 msgstr "La andre program sende kommandoer til JOSM."
 
 #. 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 "
@@ -20486,10 +20741,17 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:71
 msgid "Provides routing capabilities."
 msgstr "Gir deg Ruteplanlegger på OSM data."
 
+#. 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 "
@@ -20500,15 +20762,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:77
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Legger inn markører eller Noder på gps posisjon."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:79
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Dialog for å redigere egenskaper i en tabell."
 
 #. 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 "
@@ -20521,10 +20783,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:83
 msgid "Make terraced houses out of single blocks."
 msgstr "Lager rekkehus / terassehus fra en enkel husblokk."
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:85
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -20533,5 +20795,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) "
@@ -20540,5 +20802,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:89
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20547,10 +20809,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 "
@@ -20561,5 +20823,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 "
@@ -20569,5 +20831,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:97
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20576,15 +20838,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:99
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Last enkelt ned data langs strekninger av sammenknyttede veier."
 
 #. Plugin wayselector
-#: build/trans_plugins.java: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 "
@@ -20593,9 +20855,8 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:105
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
-msgstr ""
-"Vis koordinatfestet bilde som bakgrunn i JOSM (WMS-tjenere, Yahoo, …)."
+msgstr "Vis koordinatfestet bilde som bakgrunn i JOSM (WMS-tjenere, Yahoo, …)."
 
 #. <!--
@@ -20666,5 +20927,5 @@
 #: build/trans_presets.java:77
 msgid "Highways"
-msgstr ""
+msgstr "Ferdselsveier"
 
 #. group "Highways"
@@ -20767,5 +21028,5 @@
 #: build/trans_presets.java:523 build/trans_presets.java:1255
 msgid "Max. speed (km/h)"
-msgstr "Hastighetsbegrensning (km/t)"
+msgstr "Fartsgrense (km/t)"
 
 #. item "Highways/Streets/Motorway" text "Max. speed (km/h)"
@@ -21120,5 +21381,5 @@
 #: build/trans_presets.java:587 build/trans_presets.java:605
 msgid "Passing Places"
-msgstr ""
+msgstr "Passeringspunkter"
 
 #. item "Highways/Streets/Unclassified" text "Max. speed (km/h)"
@@ -21406,5 +21667,5 @@
 #: build/trans_presets.java:304
 msgid "Service"
-msgstr "oppkjørsel"
+msgstr "Adkomstvei"
 
 #. item "Highways/Streets/Service"
@@ -21413,5 +21674,5 @@
 #: build/trans_presets.java:307
 msgid "Edit Serviceway"
-msgstr "Rediger oppkjørsel"
+msgstr "Rediger adkomstvei"
 
 #. item "Highways/Streets/Service" label "Edit Serviceway"
@@ -21482,10 +21743,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 "rundkjøring"
@@ -21503,5 +21764,5 @@
 #: build/trans_presets.java:381
 msgid "Edit Road Restrictions"
-msgstr "Rediger restriksjioner"
+msgstr "Rediger restriksjoner"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
@@ -21622,8 +21883,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"/>
@@ -21664,5 +21925,5 @@
 #: build/trans_presets.java:475
 msgid "delivery"
-msgstr ""
+msgstr "leveranse"
 
 #. item "Amenities/Toilets" combo "Wheelchair"
@@ -21787,10 +22048,10 @@
 #: build/trans_presets.java:394
 msgid "Public Service Vehicles (psv)"
-msgstr "Offentlige Tjenestekjøretøy (psv)"
+msgstr "Offentlig transport"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
 #: build/trans_presets.java:396
 msgid "Min. speed (km/h)"
-msgstr "Min. hastighet (km/t)"
+msgstr "Minste fart (km/t)"
 
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
@@ -21798,20 +22059,20 @@
 #: build/trans_presets.java:397 build/trans_presets.java:436
 msgid "Max. weight (tonnes)"
-msgstr "maks totalvekt"
+msgstr "Maksvekt (tonn)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
 #: build/trans_presets.java:398
 msgid "Max. Height (meters)"
-msgstr "Max. Høyde (meter)"
+msgstr "Makshøyde (meter)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
 #: build/trans_presets.java:399
 msgid "Max. Width (meters)"
-msgstr "Max. Bredde (meter)"
+msgstr "Maksbredde (meter)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
 #: build/trans_presets.java:400
 msgid "Max. Length (meters)"
-msgstr "Max. Lengde (meter)"
+msgstr "Makslengde (meter)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
@@ -21833,5 +22094,5 @@
 #. color motorroad
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21841,5 +22102,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21858,5 +22119,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21866,5 +22127,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21883,5 +22144,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -21891,5 +22152,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -21908,5 +22169,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -21916,5 +22177,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -21929,5 +22190,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -21945,8 +22206,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 "boligvei"
@@ -21961,5 +22222,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -21968,5 +22229,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--public_transport tags -->
 #. <rule>
@@ -21976,10 +22237,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 "adkomstvei"
@@ -21994,5 +22255,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -22001,5 +22262,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -22009,10 +22270,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 "veiarbeid"
@@ -22036,5 +22297,5 @@
 #: build/trans_presets.java:455
 msgid "Ways"
-msgstr "Måter"
+msgstr "Mindre veier"
 
 #. group "Ways"
@@ -22161,5 +22422,5 @@
 #: build/trans_presets.java:509
 msgid "Dedicated Bridleway"
-msgstr ""
+msgstr "Dedikert ridevei"
 
 #. item "Ways/Dedicated Bridleway"
@@ -22173,5 +22434,5 @@
 #: build/trans_presets.java:527
 msgid "Dedicated Cycleway"
-msgstr ""
+msgstr "Dedikert sykkelvei"
 
 #. item "Ways/Dedicated Cycleway"
@@ -22201,5 +22462,5 @@
 #: build/trans_presets.java:547
 msgid "Segregated Foot- and Cycleway"
-msgstr ""
+msgstr "Adskilt gang- og sykkelvei"
 
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
@@ -22207,5 +22468,5 @@
 #: build/trans_presets.java:569
 msgid "Combined Foot- and Cycleway"
-msgstr ""
+msgstr "Kombinert gang- og sykkelvei"
 
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
@@ -22213,5 +22474,5 @@
 #: build/trans_presets.java:592
 msgid "Dedicated Footway"
-msgstr ""
+msgstr "Dedikert gangvei"
 
 #. item "Ways/Dedicated Footway"
@@ -22428,5 +22689,5 @@
 #: build/trans_presets.java:675
 msgid "Traffic Calming"
-msgstr ""
+msgstr "Fartsdemping"
 
 #. item "Waypoints/Traffic Calming"
@@ -22434,5 +22695,5 @@
 #: build/trans_presets.java:677
 msgid "Edit Traffic Calming"
-msgstr ""
+msgstr "Rediger fartsdemping"
 
 #: build/trans_presets.java:678
@@ -22462,5 +22723,5 @@
 #: build/trans_presets.java:680
 msgid "Passing Place"
-msgstr ""
+msgstr "Passeringspunkt"
 
 #. item "Waypoints/Passing Place"
@@ -22468,5 +22729,5 @@
 #: build/trans_presets.java:682
 msgid "Edit Passing Place"
-msgstr ""
+msgstr "Rediger passeringspunkt"
 
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
@@ -22541,5 +22802,5 @@
 #: build/trans_presets.java:719
 msgid "Grit Bin"
-msgstr ""
+msgstr "Strøkasse"
 
 #. item "Waypoints/Grit Bin"
@@ -22835,10 +23096,10 @@
 #: build/trans_presets.java:919
 msgid "Turnstile"
-msgstr ""
+msgstr "Rotasjonsport"
 
 #. item "Barriers/Turnstile"
 #: build/trans_presets.java:920
 msgid "Edit Turnstile"
-msgstr ""
+msgstr "Rediger rotasjonsport"
 
 #. item "Barriers/Turnstile" check "Bicycle"
@@ -22887,5 +23148,5 @@
 #: build/trans_presets.java:960
 msgid "Ditch"
-msgstr ""
+msgstr "Dike"
 
 #. item "Water/Water/Ditch"
@@ -22893,5 +23154,5 @@
 #: build/trans_presets.java:962
 msgid "Edit Ditch"
-msgstr ""
+msgstr "Rediger dike"
 
 #. item "Water/Water/Ditch" combo "Layer"
@@ -23018,11 +23279,11 @@
 #. <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 "Myrområde"
+msgstr "myrområde"
 
 #: build/trans_presets.java:1041
@@ -23350,5 +23611,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -23358,5 +23619,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -23366,5 +23627,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -23374,5 +23635,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -23382,5 +23643,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -23390,5 +23651,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -23398,5 +23659,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -23407,5 +23668,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -23413,9 +23674,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 "jernbane"
@@ -23643,5 +23904,5 @@
 msgctxt "aerialway"
 msgid "Station"
-msgstr ""
+msgstr "Stasjon"
 
 #. item "Aerialway/Station"
@@ -23650,5 +23911,5 @@
 msgctxt "aerialway"
 msgid "Edit Station"
-msgstr ""
+msgstr "Rediger stasjon"
 
 #. item "Aerialway/Station" text "Name"
@@ -23656,5 +23917,5 @@
 msgctxt "aerialway"
 msgid "Pylon"
-msgstr ""
+msgstr "Stolpe"
 
 #. item "Aerialway/Pylon"
@@ -23663,5 +23924,5 @@
 msgctxt "aerialway"
 msgid "Edit Pylon"
-msgstr ""
+msgstr "Rediger stolpe"
 
 #. group "Car"
@@ -24146,5 +24407,5 @@
 #: build/trans_presets.java:1390 build/trans_presets.java:1414
 msgid "Rental"
-msgstr "Bilutleie"
+msgstr "Utleie"
 
 #. item "Car/Rental"
@@ -24188,5 +24449,5 @@
 msgctxt "railway"
 msgid "Station"
-msgstr ""
+msgstr "Stasjon"
 
 #. item "Public Transport/Station"
@@ -24196,5 +24457,5 @@
 msgctxt "railway"
 msgid "Edit Station"
-msgstr ""
+msgstr "Rediger stasjon"
 
 #. item "Public Transport/Station" text "Name"
@@ -24207,5 +24468,5 @@
 #: build/trans_presets.java:1434
 msgid "Railway Halt"
-msgstr "Jernbanestopp"
+msgstr ""
 
 #. item "Public Transport/Railway Halt"
@@ -24308,5 +24569,5 @@
 #: build/trans_presets.java:2501
 msgid "Shelter"
-msgstr "Leskur / Ly for natten"
+msgstr "Ly"
 
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
@@ -24375,5 +24636,5 @@
 #: build/trans_presets.java:1529
 msgid "Runway"
-msgstr ""
+msgstr "Rullebane"
 
 #. item "Airport/Runway"
@@ -24381,5 +24642,5 @@
 #: build/trans_presets.java:1531
 msgid "Edit Runway"
-msgstr ""
+msgstr "Rediger rullebane"
 
 #. item "Airport/Runway" text "Reference"
@@ -24387,5 +24648,5 @@
 #: build/trans_presets.java:1537
 msgid "Taxiway"
-msgstr ""
+msgstr "Taksebane"
 
 #. item "Airport/Taxiway"
@@ -24393,5 +24654,5 @@
 #: build/trans_presets.java:1539
 msgid "Edit Taxiway"
-msgstr ""
+msgstr "Rediger taksebane"
 
 #. item "Airport/Taxiway" text "Reference"
@@ -24399,5 +24660,5 @@
 #: build/trans_presets.java:1545
 msgid "Helipad"
-msgstr ""
+msgstr "Helikopterdekk"
 
 #. item "Airport/Helipad"
@@ -24405,5 +24666,5 @@
 #: build/trans_presets.java:1547
 msgid "Edit Helipad"
-msgstr ""
+msgstr "Rediger helikopterdekk"
 
 #. item "Airport/Helipad" text "Reference"
@@ -24413,5 +24674,5 @@
 #: build/trans_presets.java:1553 build/trans_presets.java:1555
 msgid "Apron"
-msgstr ""
+msgstr "Oppstillingsplass"
 
 #. item "Airport/Apron" label "Apron"
@@ -24421,5 +24682,5 @@
 #: build/trans_presets.java:1558 build/trans_presets.java:1560
 msgid "Hangar"
-msgstr ""
+msgstr "Hangar"
 
 #. item "Airport/Hangar" label "Hangar"
@@ -24439,5 +24700,5 @@
 #: build/trans_presets.java:1568 build/trans_presets.java:1570
 msgid "Windsock"
-msgstr ""
+msgstr "Vindpølse"
 
 #. item "Airport/Windsock" label "Windsock"
@@ -24446,5 +24707,5 @@
 #: build/trans_presets.java:1574
 msgid "Terminal"
-msgstr ""
+msgstr "Terminal"
 
 #. item "Airport/Terminal"
@@ -24452,5 +24713,5 @@
 #: build/trans_presets.java:1576
 msgid "Edit Terminal"
-msgstr ""
+msgstr "Rediger terminal"
 
 #. item "Airport/Gate"
@@ -24458,10 +24719,10 @@
 #: build/trans_presets.java:1582
 msgid "Edit Terminal Gate"
-msgstr ""
+msgstr "Rediger terminalutgang"
 
 #. item "Airport/Gate" text "Reference"
 #: build/trans_presets.java:1588
 msgid "Travel"
-msgstr ""
+msgstr "Reise"
 
 #. group "Travel"
@@ -24813,10 +25074,10 @@
 #: build/trans_presets.java:1745
 msgid "Detail Grade"
-msgstr ""
+msgstr "Karttype"
 
 #. item "Tourism/Map" combo "Detail Grade"
 #: build/trans_presets.java:1745
 msgid "topo"
-msgstr ""
+msgstr "Topografisk"
 
 #. color tertiary
@@ -24825,5 +25086,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24833,5 +25094,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24841,5 +25102,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24849,5 +25110,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -24856,26 +25117,26 @@
 #: build/trans_style.java:665
 msgid "street"
-msgstr "gate"
+msgstr "Gater"
 
 #: build/trans_presets.java:1745
 msgid "scheme"
-msgstr ""
+msgstr "Diagram"
 
 #: build/trans_presets.java:1746
 msgid "Shown Area"
-msgstr ""
+msgstr "Synlig område"
 
 #. item "Tourism/Map" combo "Shown Area"
 #: build/trans_presets.java:1746
 msgid "site"
-msgstr ""
+msgstr "Sted"
 
 #: build/trans_presets.java:1746
 msgid "city"
-msgstr ""
+msgstr "By"
 
 #: build/trans_presets.java:1746
 msgid "region"
-msgstr ""
+msgstr "Region"
 
 #. item "Tourism/Other Information Points" text "Name"
@@ -24891,5 +25152,5 @@
 #: build/trans_presets.java:1749 build/trans_presets.java:1772
 msgid "Routes shown for:"
-msgstr ""
+msgstr "Ruter for:"
 
 #. item "Tourism/Map" label "Routes shown for:"
@@ -24910,5 +25171,5 @@
 #: build/trans_presets.java:1752 build/trans_presets.java:1775
 msgid "Mountainbiking"
-msgstr ""
+msgstr "Fjellsykling"
 
 #. item "Tourism/Map" check "Mountainbiking"
@@ -24923,5 +25184,5 @@
 #: build/trans_presets.java:1754 build/trans_presets.java:1777
 msgid "Riding"
-msgstr ""
+msgstr "Riding"
 
 #. item "Tourism/Map" check "Riding"
@@ -24929,5 +25190,5 @@
 #: build/trans_presets.java:1755 build/trans_presets.java:1778
 msgid "... other transportation modes possible"
-msgstr ""
+msgstr "… andre typer transport mulig"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
@@ -24939,36 +25200,36 @@
 #: build/trans_presets.java:1762
 msgid "Board Content"
-msgstr ""
+msgstr "Tavleinnhold"
 
 #. item "Tourism/Information Board" combo "Board Content"
 #: build/trans_presets.java:1762
 msgid "notice"
-msgstr ""
+msgstr "Merknad"
 
 #: build/trans_presets.java:1762
 msgid "history"
-msgstr "historisk"
+msgstr "Historisk"
 
 #: build/trans_presets.java:1762
 msgid "nature"
-msgstr "natur"
+msgstr "Natur"
 
 #: build/trans_presets.java:1762
 msgid "wildlife"
-msgstr "dyreliv"
+msgstr "Dyreliv"
 
 #: build/trans_presets.java:1762
 msgid "plants"
-msgstr ""
+msgstr "Planter"
 
 #. item "Tourism/Information Board" text "Closer Description"
 #: build/trans_presets.java:1765
 msgid "Guidepost"
-msgstr ""
+msgstr "Veiviser"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
 #: build/trans_presets.java:1780
 msgid "Information Terminal"
-msgstr ""
+msgstr "Informasjonsterminal"
 
 #. item "Tourism/Information Terminal" text "Name"
@@ -24976,19 +25237,19 @@
 #: build/trans_presets.java:1785 build/trans_presets.java:1795
 msgid "Closer description"
-msgstr ""
+msgstr "Nærmere beskrivelse"
 
 #: build/trans_presets.java:1790
 msgid "Audioguide"
-msgstr ""
+msgstr "Lydomviser"
 
 #. <space />
 #: build/trans_presets.java:1800
 msgid "Audioguide via mobile phone?"
-msgstr ""
+msgstr "Lydomvisning via mobiltelefon"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
 #: build/trans_presets.java:1801
 msgid "Phone number"
-msgstr ""
+msgstr "Telefonnummer"
 
 #. item "Tourism/Audioguide" text "Phone number"
@@ -25000,5 +25261,5 @@
 #: build/trans_presets.java:1811
 msgid "Edit Shelter"
-msgstr "Rediger ly for natten"
+msgstr "Rediger ly"
 
 #. item "Tourism/Shelter" text "Name"
@@ -25069,5 +25330,5 @@
 #: build/trans_presets.java:1851
 msgid "Palaeontological Site"
-msgstr ""
+msgstr "Paleontologisk sted"
 
 #. item "Historic Places/Palaeontological Site"
@@ -25075,5 +25336,5 @@
 #: build/trans_presets.java:1853
 msgid "Edit Palaeontological Site"
-msgstr ""
+msgstr "Rediger paleontologisk sted"
 
 #. item "Historic Places/Palaeontological Site" text "Name"
@@ -25122,10 +25383,10 @@
 #: build/trans_presets.java:1879
 msgid "Boundary Stone"
-msgstr ""
+msgstr "Grensestein"
 
 #. item "Historic Places/Boundary Stone"
 #: build/trans_presets.java:1880
 msgid "Edit Boundary Stone"
-msgstr ""
+msgstr "Rediger grensestein"
 
 #. item "Historic Places/Boundary Stone" text "Name"
@@ -25211,7 +25472,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--sport tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -25221,5 +25482,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -25229,5 +25490,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -25237,5 +25498,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -25245,5 +25506,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -25253,5 +25514,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -25261,5 +25522,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -25269,5 +25530,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -25277,5 +25538,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -25285,5 +25546,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -25293,5 +25554,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -25301,5 +25562,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -25309,5 +25570,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -25317,5 +25578,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -25325,5 +25586,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -25333,5 +25594,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -25341,5 +25602,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -25349,5 +25610,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -25357,5 +25618,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -25365,5 +25626,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -25373,5 +25634,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -25381,5 +25642,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -25389,5 +25650,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -25397,5 +25658,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -25405,5 +25666,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -25413,5 +25674,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -25421,5 +25682,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -25429,5 +25690,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -25437,5 +25698,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -25445,5 +25706,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -25453,5 +25714,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -25461,5 +25722,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -25469,5 +25730,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -25477,5 +25738,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -25485,5 +25746,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -25493,5 +25754,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -25501,5 +25762,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -25509,5 +25770,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -25517,5 +25778,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -25525,5 +25786,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -25533,5 +25794,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -25541,5 +25802,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -25549,5 +25810,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -25557,5 +25818,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -25565,5 +25826,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -25573,5 +25834,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -25581,33 +25842,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 "sport"
@@ -26353,5 +26614,5 @@
 #: build/trans_presets.java:2168
 msgid "Man-Made"
-msgstr ""
+msgstr "Menneskeskapt"
 
 #. group "Man-Made/Buildings"
@@ -27135,5 +27396,5 @@
 #: build/trans_presets.java:2451
 msgid "limited"
-msgstr ""
+msgstr "begrenset"
 
 #. item "Shops/Vending machine" text "Reference number"
@@ -27240,5 +27501,5 @@
 #: build/trans_presets.java:2484
 msgid "Waste Basket"
-msgstr ""
+msgstr "Søppeldunk"
 
 #. item "Amenities/Waste Basket"
@@ -27246,5 +27507,5 @@
 #: build/trans_presets.java:2486
 msgid "Edit Waste Basket"
-msgstr ""
+msgstr "Rediger søppeldunk"
 
 #. item "Amenities/Bench"
@@ -27253,18 +27514,18 @@
 #: build/trans_presets.java:2492
 msgid "Backrest"
-msgstr ""
+msgstr "Ryggstø"
 
 #: build/trans_presets.java:2493
 msgid "Material"
-msgstr ""
+msgstr "Material"
 
 #. item "Amenities/Bench" combo "Material"
 #: build/trans_presets.java:2493
 msgid "stone"
-msgstr ""
+msgstr "stein"
 
 #: build/trans_presets.java:2493
 msgid "plastic"
-msgstr ""
+msgstr "plast"
 
 #: build/trans_presets.java:2494
@@ -27285,7 +27546,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--landuse tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -27295,5 +27556,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -27303,5 +27564,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -27311,5 +27572,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -27319,5 +27580,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -27327,5 +27588,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -27335,5 +27596,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -27343,5 +27604,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -27351,12 +27612,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 "grønn"
@@ -27446,5 +27707,5 @@
 #: build/trans_presets.java:2519
 msgid "Fire Hydrant"
-msgstr ""
+msgstr "Hydrant"
 
 #. item "Amenities/Fire Hydrant"
@@ -27453,5 +27714,5 @@
 #: build/trans_presets.java:2522
 msgid "Edit Fire Hydrant"
-msgstr ""
+msgstr "Rediger hydrant"
 
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
@@ -27459,5 +27720,5 @@
 #: build/trans_presets.java:2525
 msgid "Baby Hatch"
-msgstr "Stellebord"
+msgstr "Babyboks"
 
 #. item "Amenities/Baby Hatch"
@@ -27465,5 +27726,5 @@
 #: build/trans_presets.java:2527
 msgid "Edit Baby Hatch"
-msgstr "Rediger stellebord"
+msgstr "Rediger babyboks"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
@@ -27475,5 +27736,5 @@
 #: build/trans_presets.java:2534
 msgid "Car Dealer"
-msgstr ""
+msgstr "Bilforretning"
 
 #. item "Shops/Car Dealer"
@@ -27486,5 +27747,5 @@
 #: build/trans_presets.java:2541
 msgid "Bike Dealer"
-msgstr ""
+msgstr "Sykkelforretning"
 
 #. item "Shops/Bike Dealer"
@@ -27493,5 +27754,5 @@
 #: build/trans_presets.java:2544
 msgid "Edit Bicycle Shop"
-msgstr "Rediger sykkelbutikk"
+msgstr "Rediger sykkelforretning"
 
 #. item "Shops/Bike Dealer" text "Name"
@@ -27507,10 +27768,10 @@
 #: build/trans_presets.java:2554
 msgid "Chemist"
-msgstr ""
+msgstr "Hygiene"
 
 #. item "Shops/Chemist"
 #: build/trans_presets.java:2555
 msgid "Edit Chemist"
-msgstr ""
+msgstr "Rediger hygiene"
 
 #: build/trans_presets.java:2560
@@ -27522,5 +27783,5 @@
 #: build/trans_presets.java:2562
 msgid "Edit Convenience Store"
-msgstr "Rediger Minimarked"
+msgstr "Rediger minimarked"
 
 #: build/trans_presets.java:2567
@@ -27813,5 +28074,5 @@
 #: build/trans_presets.java:2739
 msgid "photos"
-msgstr "foto"
+msgstr "fotografier"
 
 #: build/trans_presets.java:2739
@@ -27829,5 +28090,5 @@
 #: build/trans_presets.java:2739
 msgid "stamps"
-msgstr "frimerke"
+msgstr "frimerker"
 
 #: build/trans_presets.java:2739
@@ -27841,9 +28102,9 @@
 #: build/trans_presets.java:2739
 msgid "vouchers"
-msgstr "sedler"
+msgstr "kuponger"
 
 #: build/trans_presets.java:2739
 msgid "bicycle_tube"
-msgstr ""
+msgstr "sykkelslanger"
 
 #: build/trans_presets.java:2739
@@ -27887,5 +28148,5 @@
 #: build/trans_presets.java:2761
 msgid "Money Exchange"
-msgstr "Veksle valuta"
+msgstr "Vekslingssted"
 
 #. item "Cash/Money Exchange"
@@ -27893,5 +28154,5 @@
 #: build/trans_presets.java:2763
 msgid "Edit Money Exchange"
-msgstr "Rediger valutaveksling"
+msgstr "Rediger vekslingssted"
 
 #. item "Cash/Automated Teller Machine"
@@ -28137,5 +28398,5 @@
 #: build/trans_presets.java:2906
 msgid "Islet"
-msgstr ""
+msgstr "Holme"
 
 #. item "Geography/Places/Islet"
@@ -28143,5 +28404,5 @@
 #: build/trans_presets.java:2908
 msgid "Edit Islet"
-msgstr ""
+msgstr "Rediger holme"
 
 #. item "Geography/Places/Islet" text "Name"
@@ -28548,10 +28809,10 @@
 #: build/trans_presets.java:3149
 msgid "Military"
-msgstr "Millitært"
+msgstr "Militært"
 
 #. item "Land use/Military"
 #: build/trans_presets.java:3150
 msgid "Edit Military Landuse"
-msgstr "Rediger millitært"
+msgstr "Rediger militært"
 
 #. item "Land use/Military" text "Name"
@@ -28634,5 +28895,5 @@
 #: build/trans_presets.java:3203
 msgid "Boundary"
-msgstr ""
+msgstr "Grense"
 
 #. item "Relations/Boundary"
@@ -28643,5 +28904,5 @@
 #: build/trans_presets.java:3208
 msgid "Edit Boundary"
-msgstr ""
+msgstr "Rediger grense"
 
 #. item "Relations/Boundary" text "Name"
@@ -28649,36 +28910,36 @@
 #: build/trans_presets.java:3212
 msgid "Boundary type"
-msgstr ""
+msgstr "Grensetype"
 
 #. item "Relations/Boundary" combo "Boundary type"
 #: build/trans_presets.java:3212
 msgid "administrative"
-msgstr ""
+msgstr "administrativ"
 
 #: build/trans_presets.java:3212
 msgid "national"
-msgstr ""
+msgstr "nasjonal"
 
 #: build/trans_presets.java:3212
 msgid "civil"
-msgstr ""
+msgstr "kommunegrense"
 
 #: build/trans_presets.java:3212
 msgid "political"
-msgstr ""
+msgstr "politisk"
 
 #: build/trans_presets.java:3213
 msgid "Administrative level"
-msgstr ""
+msgstr "Administrativt nivå"
 
 #. item "Relations/Boundary" role "inner segment"
 #: build/trans_presets.java:3218
 msgid "Sub area"
-msgstr ""
+msgstr "Delområde"
 
 #. item "Relations/Boundary" role "Sub area"
 #: build/trans_presets.java:3219
 msgid "Administration centre"
-msgstr ""
+msgstr "Administrativt senter"
 
 #. item "Relations/Boundary" role "Administration centre"
@@ -28772,5 +29033,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -28786,5 +29047,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28794,18 +29055,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 -->
@@ -28814,7 +29092,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- cycleway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28824,5 +29102,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28832,5 +29110,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28840,5 +29118,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28848,12 +29126,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 "sykkel"
@@ -28880,5 +29159,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -28894,5 +29173,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -28902,5 +29181,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28909,13 +29188,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"/>
@@ -28926,11 +29213,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 "fotgjenger"
@@ -28949,8 +29237,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 "T-bane"
@@ -28970,5 +29258,5 @@
 #: build/trans_presets.java:3250
 msgid "Route state"
-msgstr ""
+msgstr "Rutetilstand"
 
 #. item "Relations/Route" combo "Route state"
@@ -29062,9 +29350,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
@@ -29072,5 +29360,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,
@@ -29080,8 +29368,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
@@ -29095,5 +29383,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#. 
+#.
 #: build/trans_style.java:72
 msgid "standard"
@@ -29101,5 +29389,5 @@
 
 #. mappaint style named "standard"
-#. 
+#.
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -29148,6 +29436,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>
@@ -29227,5 +29515,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -29235,18 +29523,18 @@
 #. <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 "uønsket"
+msgstr "avleggs"
 
 #. color foot
@@ -29255,5 +29543,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -29262,5 +29550,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -29269,5 +29557,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -29283,5 +29571,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -29295,5 +29583,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -29302,5 +29590,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -29309,5 +29597,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -29316,5 +29604,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -29323,5 +29611,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -29330,5 +29618,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -29337,5 +29625,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxweight"/>
@@ -29344,5 +29632,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxheight"/>
@@ -29351,5 +29639,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -29358,5 +29646,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxlength"/>
@@ -29365,5 +29653,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -29372,5 +29660,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="minspeed"/>
@@ -29379,5 +29667,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxstay"/>
@@ -29386,5 +29674,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="toll"/>
@@ -29393,5 +29681,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="barrier"/>
@@ -29568,12 +29856,12 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- highway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
 #: build/trans_style.java:548
 msgid "motorroad"
-msgstr ""
+msgstr "motortrafikkvei"
 
 #. color street
@@ -29582,5 +29870,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -29590,7 +29878,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- tracktype tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -29600,5 +29888,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -29608,5 +29896,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -29616,5 +29904,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -29624,12 +29912,12 @@
 #. <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 "ferdselsvei – traktorvei"
+msgstr "traktorvei"
 
 #. color rail
@@ -29638,5 +29926,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -29645,5 +29933,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -29653,5 +29941,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -29660,5 +29948,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -29667,5 +29955,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -29674,5 +29962,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -29681,5 +29969,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -29688,5 +29976,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -29695,5 +29983,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -29702,5 +29990,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -29709,5 +29997,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -29716,8 +30004,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 "service"
@@ -29728,8 +30016,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 "vadested"
@@ -29740,5 +30028,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -29747,8 +30035,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 "vendesirkel"
@@ -29759,9 +30047,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 "redningsmøtepunkt"
@@ -29772,9 +30060,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 "elvebredd"
@@ -29785,8 +30073,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 "bekk"
@@ -29797,8 +30085,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 "tørrdokk"
@@ -29809,5 +30097,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29816,5 +30104,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29823,5 +30111,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29831,5 +30119,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29838,5 +30126,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29845,5 +30133,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29852,5 +30140,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29860,5 +30148,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29869,5 +30157,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -29877,7 +30165,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--man_made tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -29887,5 +30175,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -29895,5 +30183,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -29903,5 +30191,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -29912,5 +30200,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -29919,5 +30207,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -29927,5 +30215,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -29935,5 +30223,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -29943,5 +30231,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -29951,5 +30239,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -29959,5 +30247,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -29967,5 +30255,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -29975,5 +30263,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -29983,5 +30271,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -29991,18 +30279,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 "menneskeskapt"
@@ -30012,11 +30300,11 @@
 #. <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 ""
+msgstr "stryk"
 
 #. color manmade
@@ -30025,7 +30313,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- railway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -30035,5 +30323,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -30042,5 +30330,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -30050,5 +30338,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -30057,5 +30345,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -30065,5 +30353,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -30073,10 +30361,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 "jernbanepunkt"
@@ -30087,5 +30375,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -30096,13 +30384,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 "annen bane"
 
 #. color otherrail
-#: build/trans_style.java:1192
+#: build/trans_style.java:1217
 msgid "railover"
 msgstr "jernbanebro"
@@ -30113,5 +30401,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -30121,5 +30409,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30132,5 +30420,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30138,7 +30426,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 "nedlagt bane"
@@ -30149,5 +30437,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -30156,5 +30444,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -30163,5 +30451,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -30170,7 +30458,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aeroway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -30181,11 +30469,11 @@
 #. <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 "aeroway"
+msgstr "luftfart"
 
 #. color aeroway
@@ -30194,8 +30482,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 "stasjon"
@@ -30206,5 +30494,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -30214,10 +30502,10 @@
 #. <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 "aeroway_dark"
+msgstr "luftfart, mørk"
 
 #. color aeroway
@@ -30226,10 +30514,10 @@
 #. <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 "aeroway_light"
+msgstr "luftfart, lys"
 
 #. color aeroway_light
@@ -30238,5 +30526,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -30245,5 +30533,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -30252,7 +30540,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aerialway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -30262,5 +30550,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -30270,5 +30558,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -30278,5 +30566,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -30286,5 +30574,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -30294,12 +30582,12 @@
 #. <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 "aerialway"
+msgstr "taubane"
 
 #. color aerialway
@@ -30308,11 +30596,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 "nedfart enkel"
@@ -30323,9 +30611,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 "nedfart middels"
@@ -30336,9 +30624,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 "nedfart avansert"
@@ -30349,9 +30637,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 "nedfart ekspert"
@@ -30362,9 +30650,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 "nedfart friløp"
@@ -30375,9 +30663,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 "nedfart nybegynner"
@@ -30388,7 +30676,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--power tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -30398,5 +30686,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -30405,5 +30693,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -30413,5 +30701,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -30421,5 +30709,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -30429,5 +30717,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -30437,5 +30725,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -30445,5 +30733,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -30453,5 +30741,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -30461,5 +30749,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -30469,5 +30757,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -30477,5 +30765,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -30485,5 +30773,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -30493,15 +30781,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 "kraft"
@@ -30511,9 +30799,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 "brygge"
@@ -30524,8 +30812,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 "rørgate"
@@ -30535,7 +30823,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--leisure tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -30545,5 +30833,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -30553,5 +30841,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -30561,5 +30849,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -30569,5 +30857,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -30577,5 +30865,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -30585,5 +30873,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -30593,5 +30881,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -30601,5 +30889,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -30609,5 +30897,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -30617,5 +30905,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -30625,5 +30913,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -30633,5 +30921,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -30641,5 +30929,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -30649,5 +30937,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -30657,5 +30945,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -30665,17 +30953,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 "fritid"
@@ -30685,9 +30973,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 "marina"
@@ -30697,7 +30985,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--amenity tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -30707,5 +30995,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -30715,5 +31003,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -30723,5 +31011,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -30731,5 +31019,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -30739,5 +31027,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -30747,5 +31035,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -30755,5 +31043,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -30763,5 +31051,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -30771,5 +31059,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -30779,14 +31067,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 "fasilitet"
@@ -30796,5 +31084,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30804,5 +31092,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30812,5 +31100,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30820,5 +31108,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30828,5 +31116,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30836,5 +31124,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30844,5 +31132,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30852,5 +31140,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30860,5 +31148,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30868,5 +31156,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -30876,5 +31164,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -30884,14 +31172,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 "fasilitet – trafikk"
@@ -30901,5 +31189,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -30908,5 +31196,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -30916,5 +31204,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -30923,5 +31211,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -30931,5 +31219,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -30939,5 +31227,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -30947,5 +31235,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -30954,5 +31242,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -30962,5 +31250,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -30970,5 +31258,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -30978,5 +31266,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -30986,5 +31274,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -30993,5 +31281,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -31000,5 +31288,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -31007,5 +31295,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -31014,5 +31302,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -31021,5 +31309,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -31028,5 +31316,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -31035,5 +31323,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -31042,5 +31330,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -31049,5 +31337,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -31056,5 +31344,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -31063,5 +31351,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -31070,5 +31358,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -31077,5 +31365,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -31085,5 +31373,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -31093,5 +31381,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -31101,5 +31389,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -31109,5 +31397,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -31117,5 +31405,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -31125,5 +31413,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -31133,5 +31421,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -31141,5 +31429,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -31149,5 +31437,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -31158,5 +31446,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -31166,5 +31454,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -31174,5 +31462,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -31182,5 +31470,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -31190,5 +31478,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -31198,5 +31486,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -31206,5 +31494,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -31214,5 +31502,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -31222,5 +31510,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -31230,5 +31518,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -31238,5 +31526,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -31246,5 +31534,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -31254,5 +31542,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -31262,5 +31550,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -31270,5 +31558,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -31278,5 +31566,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"/>
@@ -31286,5 +31582,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -31294,5 +31590,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -31302,5 +31598,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -31310,5 +31606,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -31317,27 +31613,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 "fasilitet – lys"
@@ -31347,5 +31644,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -31355,5 +31652,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -31363,14 +31660,14 @@
 #. <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 "light_vann"
+msgstr "små vannsteder"
 
 #. color amenity_light
@@ -31378,5 +31675,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -31386,5 +31683,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -31394,5 +31691,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -31402,5 +31699,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -31410,5 +31707,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -31418,5 +31715,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -31426,11 +31723,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 "helse"
@@ -31440,7 +31737,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--shop tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -31450,5 +31747,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -31458,5 +31755,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -31466,5 +31763,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -31474,5 +31771,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -31482,5 +31779,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -31490,5 +31787,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -31498,5 +31795,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -31506,5 +31803,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -31514,5 +31811,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -31522,5 +31819,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -31530,5 +31827,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -31538,5 +31835,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -31546,5 +31843,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -31554,5 +31851,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -31562,5 +31859,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -31570,5 +31867,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -31578,5 +31875,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -31586,5 +31883,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -31594,5 +31891,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -31602,5 +31899,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -31610,5 +31907,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -31618,5 +31915,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -31626,5 +31923,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -31634,5 +31931,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -31642,5 +31939,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -31650,5 +31947,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -31658,5 +31955,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -31666,5 +31963,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -31674,5 +31971,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -31682,5 +31979,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -31690,5 +31987,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -31698,5 +31995,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -31706,5 +32003,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -31714,5 +32011,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -31722,5 +32019,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -31730,5 +32027,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -31738,5 +32035,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -31746,5 +32043,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -31754,5 +32051,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -31762,5 +32059,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -31770,5 +32067,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -31778,31 +32075,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 "butikk"
@@ -31812,7 +32109,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--tourism tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31822,5 +32119,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31830,5 +32127,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31838,5 +32135,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31846,5 +32143,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31854,5 +32151,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31862,5 +32159,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31870,12 +32167,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 "hotell"
@@ -31885,5 +32182,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -31893,5 +32190,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -31901,5 +32198,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -31909,5 +32206,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -31917,5 +32214,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -31925,5 +32222,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -31934,5 +32231,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -31942,5 +32239,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- information tags -->
 #. <rule>
@@ -31950,5 +32247,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -31958,5 +32255,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -31965,5 +32262,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -31972,13 +32269,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 "turisme"
@@ -31988,7 +32285,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--historic tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -31998,5 +32295,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -32006,5 +32303,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -32014,5 +32311,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -32022,5 +32319,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -32030,5 +32327,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -32038,5 +32335,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -32046,5 +32343,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -32054,5 +32351,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -32062,13 +32359,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 "historisk"
@@ -32078,8 +32375,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 "steinbrudd"
@@ -32090,8 +32387,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 "avfallsdeponi"
@@ -32102,5 +32399,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -32110,8 +32407,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 "vannmagasin"
@@ -32122,8 +32419,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 "gårdstun"
@@ -32134,6 +32431,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
-#. 
+#.
+#.
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -32143,8 +32440,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 "butikker"
@@ -32155,8 +32452,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 "industri"
@@ -32167,8 +32464,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 "rivningsområde"
@@ -32179,8 +32476,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 "byggeområde"
@@ -32191,8 +32488,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 "jernbanegrunn"
@@ -32203,5 +32500,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -32211,7 +32508,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--military tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -32221,5 +32518,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -32229,5 +32526,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -32237,5 +32534,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -32245,13 +32542,13 @@
 #. <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 "millitært"
+msgstr "militært"
 
 #. color military
@@ -32260,8 +32557,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 "gravlund"
@@ -32271,8 +32568,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 "fjelltopp"
@@ -32283,9 +32580,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 "isbre"
@@ -32295,9 +32592,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 "vulkan"
@@ -32307,5 +32604,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -32316,5 +32613,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -32324,5 +32621,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -32332,5 +32629,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -32340,5 +32637,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -32348,12 +32645,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 "natur"
@@ -32363,9 +32660,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 "krattskog"
@@ -32375,9 +32672,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 "beiteområde"
@@ -32387,11 +32684,11 @@
 #. <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 ""
+msgstr "skogsområde"
 
 #. color water
@@ -32399,9 +32696,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 "søle"
@@ -32411,9 +32708,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 "strand"
@@ -32424,5 +32721,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?
@@ -32448,5 +32745,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -32457,11 +32754,11 @@
 #. </rule>
 #. -->
-#. 
+#.
 #. <!--name tags -->
-#. 
+#.
 #. <!--preferences tags -->
-#. 
+#.
 #. <!--place tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -32471,5 +32768,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -32479,5 +32776,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -32487,5 +32784,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -32495,5 +32792,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -32503,5 +32800,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -32511,5 +32808,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -32519,5 +32816,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -32527,5 +32824,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -32535,5 +32832,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -32543,5 +32840,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -32551,5 +32848,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -32559,15 +32856,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 "sted"
@@ -32577,11 +32874,11 @@
 #. <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 ""
+msgstr "tiger-data"
 
 #. <?xml version="1.0"?>
@@ -32670,5 +32967,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#. 
+#.
 #. Data type can be:
 #. node        - a node point
@@ -32676,28 +32973,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
@@ -32729,5 +33026,5 @@
 #: build/trans_validator.java:47
 msgid "Unnamed unclassified highway"
-msgstr "Ikke navngitt uklassifisert veg"
+msgstr "Uklassifisert ferdselsvei uten navn"
 
 #. way  : W : highway == unclassified && name != *
@@ -32742,10 +33039,10 @@
 #: build/trans_validator.java:51
 msgid "temporary highway type"
-msgstr "midlertidig ferselsveitype"
+msgstr "midlertidig ferdselsveitype"
 
 #. *    : W : highway == road
 #: build/trans_validator.java:52
 msgid "misspelled key name"
-msgstr "feil skrivemåte på nøkkel"
+msgstr "feilstavet nøkkelnavn"
 
 #. *    : W : / *name */i == * && name != *
@@ -32760,5 +33057,5 @@
 #: build/trans_validator.java:59
 msgid "footway with tag foot"
-msgstr "gangvei med egenskapen foot"
+msgstr "gangvei med egenskapen fotgjenger"
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
@@ -32767,5 +33064,5 @@
 #: build/trans_validator.java:62
 msgid "separate cycleway as lane on a cycleway"
-msgstr "separat sykkelvei har kjørefelt på en sykkelvei"
+msgstr "separat sykkelvei som kjørefelt på en sykkelvei"
 
 #. way  : W : highway == cycleway && cycleway == lane
@@ -32812,5 +33109,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#. 
+#.
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32823,5 +33120,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>
@@ -32846,6 +33143,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#. 
-#. 
+#.
+#.
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32854,6 +33151,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#. 
-#. 
+#.
+#.
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32868,19 +33165,19 @@
 
 #. 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
 msgid "Czech CUZK:KM"
-msgstr ""
+msgstr "Tsjekkisk CUZK:KM"
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE&
 #: build/trans_wms.java:28
 msgid "Czech UHUL:ORTOFOTO"
-msgstr ""
+msgstr "Tsjekkisk UHUL:ORTOFOTO"
 
 #. 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
@@ -32900,6 +33197,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#. 
-#. 
+#.
+#.
 #. only for Japan
 #: build/trans_wms.java:39
@@ -32923,15 +33220,15 @@
 
 #. 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
 msgid "Lodi - Italy"
-msgstr ""
+msgstr "Lodi, Italia"
 
 #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
 #: build/trans_wms.java:47
 msgid "Sicily - Italy"
-msgstr ""
+msgstr "Sicilia, Italia"
 
 #~ msgid "Move"
@@ -32953,11 +33250,10 @@
 #~ msgstr "JOSM hjelpesider"
 
-#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Feil ved nedlasting av {0}"
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still want "
-#~ "to merge them?"
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
 #~ msgstr ""
 #~ "De valgte nodene er medlemmer i forskjellige relasjoner. Vil du fremdeles "
@@ -32977,8 +33273,9 @@
 
 #~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this as "
-#~ "a bug."
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
 #~ msgstr ""
-#~ "Feilmelding: cannot check conditions for no layer. Send inn en feilmelding."
+#~ "Feilmelding: cannot check conditions for no layer. Send inn en "
+#~ "feilmelding."
 
 #~ msgid "No document open so nothing to save."
@@ -32995,9 +33292,9 @@
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data layer?"
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
 #~ msgstr ""
 #~ "Ingen data å oppdatere. Har du allerede åpnet eller lastet dette ned?"
 
-#, java-format
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
@@ -33014,5 +33311,4 @@
 #~ msgstr "Forventer parentes slutt."
 
-#, java-format
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "{0} konflikter må løses i {1} objecter"
@@ -33033,9 +33329,7 @@
 #~ msgstr "sann"
 
-#, java-format
 #~ msgid "Error: {0}"
 #~ msgstr "Feil: {0}"
 
-#, java-format
 #~ msgid "Warning: {0}"
 #~ msgstr "Advarsel: {0}"
@@ -33050,5 +33344,4 @@
 #~ msgstr "rett versjon"
 
-#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -33071,5 +33364,4 @@
 #~ msgstr "Konflikter ved sammenføyning."
 
-#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Kommandoliste: {0}"
@@ -33082,13 +33374,13 @@
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version selected "
-#~ "in the history list."
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
 #~ msgstr ""
-#~ "Tilbakestill status på alle valgte objekt til versjon som valgt i historikk."
+#~ "Tilbakestill status på alle valgte objekt til versjon som valgt i "
+#~ "historikk."
 
 #~ msgid "Delete the selected layer."
 #~ msgstr "Slett valgt Lag."
 
-#, java-format
 #~ msgid "Layers: {0}"
 #~ msgstr "Lag: {0}"
@@ -33118,9 +33410,7 @@
 #~ msgstr "Flytt ned"
 
-#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Relasjons-editor: {0}"
 
-#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "Opphavsmenn: {0}"
@@ -33159,21 +33449,16 @@
 #~ msgstr "Ingen bilder med lesbare tidsstempler funnet"
 
-#, java-format
 #~ msgid "No time for point {0} x {1}"
 #~ msgstr "Ingen tid gitt for punkt {0} x {1}"
 
-#, java-format
 #~ msgid "Images for {0}"
 #~ msgstr "Bilder for {0}"
 
-#, java-format
 #~ msgid "GPS start: {0}"
 #~ msgstr "GPS start: {0}"
 
-#, java-format
 #~ msgid "current delta: {0}s"
 #~ msgstr "nåværende forskjell: {0}s"
 
-#, java-format
 #~ msgid "GPS end: {0}"
 #~ msgstr "GPS-slutt: {0}"
@@ -33184,5 +33469,4 @@
 #~ msgstr[1] "bilder"
 
-#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} innenfor sporet."
@@ -33279,5 +33563,4 @@
 #~ msgstr "Fandt <member>-element i en ikke-relation."
 
-#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -33289,5 +33572,4 @@
 #~ " {0}"
 
-#, java-format
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
 #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
@@ -33295,28 +33577,26 @@
 #~ msgstr[1] "{0} Programtillegg oppdatert. Restart JOSM."
 
-#, java-format
 #~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded automatically."
+#~ "The plugin {0} seems to be broken or could not be downloaded "
+#~ "automatically."
 #~ msgstr ""
-#~ "Programtillegget {0} kan være ødelagt eller kunne ikke lastes ned automatisk."
-
-#, java-format
+#~ "Programtillegget {0} kan være ødelagt eller kunne ikke lastes ned "
+#~ "automatisk."
+
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Fant ikke programtillegget: {0}."
 
-#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "Programtillegget krever oppdatering {0} av JOSM."
 
-#, java-format
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Kunne ikke laste programtillegg: {0} fra {1}"
 
 #~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission to "
-#~ "overwrite the existing ones."
+#~ "Activating the updated plugins failed. Check if JOSM has the permission "
+#~ "to overwrite the existing ones."
 #~ msgstr ""
-#~ "Kunne ikke bruke oppdaterte programtillegg. Kontroller om JOSM tilgang til å "
-#~ "skrive over eksisterende."
+#~ "Kunne ikke bruke oppdaterte programtillegg. Kontroller om JOSM tilgang "
+#~ "til å skrive over eksisterende."
 
 #~ msgid ""
@@ -33324,6 +33604,6 @@
 #~ "setting the config option 'pluginmanager.warntime'.)"
 #~ msgstr ""
-#~ "(Du kan endre antall dager mellom advarslene<br>ved å endre denne verdien i "
-#~ "oppstettet 'pluginmanager.warntime'.)"
+#~ "(Du kan endre antall dager mellom advarslene<br>ved å endre denne verdien "
+#~ "i oppstettet 'pluginmanager.warntime'.)"
 
 #~ msgid ""
@@ -33331,5 +33611,6 @@
 #~ "about the problem."
 #~ msgstr ""
-#~ "Programtillegget kunne ikke slettes. Vennligst meld ifra til JOSM utviklerne."
+#~ "Programtillegget kunne ikke slettes. Vennligst meld ifra til JOSM "
+#~ "utviklerne."
 
 #~ msgid "Download missing plugins"
@@ -33339,5 +33620,4 @@
 #~ msgstr "Programtillegg finnes allerede"
 
-#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Venligst send en feilrapport på {0}"
@@ -33352,5 +33632,4 @@
 #~ msgstr "Husk å inkludere følgende informasjon:"
 
-#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -33359,12 +33638,12 @@
 #~ "{0}"
 #~ msgstr ""
-#~ "Programtillegg lista er allerede tilgengelig.  Vil du laste ned ny versjon "
-#~ "over den eksisterende?\n"
+#~ "Programtillegg lista er allerede tilgengelig.  Vil du laste ned ny "
+#~ "versjon over den eksisterende?\n"
 #~ "\n"
 #~ "{0}"
 
 #~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before reporting "
-#~ "a bug."
+#~ "Try updating to the newest version of JOSM and all plugins before "
+#~ "reporting a bug."
 #~ msgstr ""
 #~ "Prøv å oppdatere til siste versjon av JOSM og alle programtillegg før du "
@@ -33385,21 +33664,20 @@
 #~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
 #~ msgstr ""
-#~ "<html>Jeg kan fotogragere min GPS mottaker.<br>Kan det være til hjelp?</html>"
+#~ "<html>Jeg kan fotogragere min GPS mottaker.<br>Kan det være til hjelp?</"
+#~ "html>"
 
 #~ msgid "GPX Track loaded"
 #~ msgstr "GPX-spor er lagt inn"
 
-#, java-format
 #~ msgid "Found {0} matches of {1} in GPX track {2}"
 #~ msgstr "Fant {0} treff av {1} i GPX spor {2}"
 
 #~ msgid ""
-#~ "An error occured while trying to match the photos to the GPX track. You can "
-#~ "adjust the sliders to manually match the photos."
+#~ "An error occured while trying to match the photos to the GPX track. You "
+#~ "can adjust the sliders to manually match the photos."
 #~ msgstr ""
 #~ "Feil ved kobling av foto til GPX spor. Still inn rullefeltet for manuell "
 #~ "kobling."
 
-#, java-format
 #~ msgid "Offset between track and photos: {0}m {1}s"
 #~ msgstr "Forskyvning mellom spor og foto: {0}m {1}s"
@@ -33414,5 +33692,4 @@
 #~ msgstr "Lambert Zone 4 cache file (.4)"
 
-#, java-format
 #~ msgid "Change the projection to {0} first."
 #~ msgstr "Bytt til kartprojeksjonen {0}."
@@ -33439,6 +33716,6 @@
 #~ msgstr "Åpne vindu med OpenStreetBugs og aktiviser automatisk nedlasting"
 
-#, java-format
-#~ msgid "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
+#~ msgid ""
+#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
 #~ msgstr ""
 #~ "Lambert sone {0} i mellomlager  stemmer ikke med aktiv Lambert sone {1}"
@@ -33489,7 +33766,4 @@
 #~ msgstr "Ingen skjæringspunkt funnet. Ingen endringer utført."
 
-#~ msgid "Are you sure?"
-#~ msgstr "Er du sikker?"
-
 #~ msgid "Validate either current selection or complete dataset."
 #~ msgstr "Valider enten aktivt utvalg eller hele datasett."
@@ -33516,11 +33790,10 @@
 #~ msgstr "Hjelp / Om"
 
-#, java-format
 #~ msgid "rectifier id={0}"
 #~ msgstr "rectifier id={0}"
 
 #~ msgid ""
-#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
-#~ "these will then show up in the WMS menu.\n"
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
 #~ "\n"
 #~ "You can also do this manually in the Advanced Preferences, using the "
@@ -33537,6 +33810,6 @@
 #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
 #~ "only need to input the relevant 'id'.\n"
-#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in "
-#~ "this example,replacing 73 with your image id: \n"
+#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
+#~ "in this example,replacing 73 with your image id: \n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -33545,6 +33818,6 @@
 #~ "use."
 #~ msgstr ""
-#~ "Du kan legge til, endre eller slette WMS kilder i WMSplugin Innstillinger - "
-#~ "disse vil vises i WMS menyen.\n"
+#~ "Du kan legge til, endre eller slette WMS kilder i WMSplugin Innstillinger "
+#~ "- disse vil vises i WMS menyen.\n"
 #~ "Kan også settes manuelt i Avanserte innstillinger, etter følgende mal:\n"
 #~ "wmsplugin.url.1.name=Landsat\n"
@@ -33557,16 +33830,17 @@
 #~ "format=image/jpeg \n"
 #~ "\n"
-#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , må du "
-#~ "bare oppgi gyldig 'id'.\n"
-#~ "Å legge inn  Metacarta Map Rectifier menyer, lag en URL manuelt som i dette "
-#~ "eksempelet. Bytt ut  73 med din bilde id: \n"
+#~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , må "
+#~ "du bare oppgi gyldig 'id'.\n"
+#~ "Å legge inn  Metacarta Map Rectifier menyer, lag en URL manuelt som i "
+#~ "dette eksempelet. Bytt ut  73 med din bilde id: \n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
 #~ " \n"
-#~ "OBS:  Sjekk at bildet er egnet med hensyn til kopibeskyttelse. Er du i tvil: "
-#~ "la være å bruke bildet."
+#~ "OBS:  Sjekk at bildet er egnet med hensyn til kopibeskyttelse. Er du i "
+#~ "tvil: la være å bruke bildet."
 
 #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
-#~ msgstr "Last ned Ortografisk korrekt bilde fra Metacarta's Map Rectifier WMS"
+#~ msgstr ""
+#~ "Last ned Ortografisk korrekt bilde fra Metacarta's Map Rectifier WMS"
 
 #~ msgid "Please select the row to copy."
@@ -33582,6 +33856,6 @@
 #~ msgid ""
 #~ "The main feature of the plugin is the possibility to delete points of the "
-#~ "GPX track. This plugin can be used to prepare  tracks for uploading to OSM "
-#~ "eg. deleting uninteresting parts of track."
+#~ "GPX track. This plugin can be used to prepare  tracks for uploading to "
+#~ "OSM eg. deleting uninteresting parts of track."
 #~ msgstr ""
 #~ "Programtilleggets hovedfunksjon er sletting av punkt i GPX sporfil. "
@@ -33626,6 +33900,6 @@
 
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want to "
-#~ "combine them?"
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
 #~ msgstr "Vil du virkelig sammenføye linjer med forskjellig tilhørighet?"
 
@@ -33649,5 +33923,4 @@
 #~ msgstr "Linje for areal er ikke lukket."
 
-#, java-format
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr "Ignorerer en linje fordi den har en node som ikke eksisterer: {0}\n"
@@ -33657,6 +33930,6 @@
 
 #~ msgid ""
-#~ "Several utilities that make your life easier: e.g. simplify way, join areas, "
-#~ "jump to position."
+#~ "Several utilities that make your life easier: e.g. simplify way, join "
+#~ "areas, jump to position."
 #~ msgstr ""
 #~ "Flere verktøy som kan gjøre livet enklere. Eksempel: forenkle linje, Slå "
@@ -33681,5 +33954,4 @@
 #~ msgstr "sykkelkart"
 
-#, java-format
 #~ msgid "Image with path {0} does not exist or is not readable."
 #~ msgstr "Bilde fra {0} finnes ikke eller er ikke lesbart."
@@ -33718,5 +33990,4 @@
 #~ msgstr "Feil under nedlasting"
 
-#, java-format
 #~ msgid ""
 #~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
@@ -33726,9 +33997,7 @@
 #~ "intervall, for eksempel nodes:10-20"
 
-#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "Koble til {0} …"
 
-#, java-format
 #~ msgid "Incorrect value of id operator: {0}. Number is expected."
 #~ msgstr "Ugyldig verdi for id-operator: {0}. Verdien må være et tall."
@@ -33738,13 +34007,12 @@
 
 #~ msgid ""
-#~ "You are about to delete nodes outside of the area you have "
-#~ "downloaded.<br>This can cause problems because other objects (that you don't "
-#~ "see) might use them.<br>Do you really want to delete?"
+#~ "You are about to delete nodes outside of the area you have downloaded."
+#~ "<br>This can cause problems because other objects (that you don't see) "
+#~ "might use them.<br>Do you really want to delete?"
 #~ msgstr ""
-#~ "Du er i ferd med å slette noder utenfor nedlastet område.<br>Dette kan skape "
-#~ "problemer fordi de kan være i bruk av andre objekter (som du ikke kan se nå) "
-#~ ".<br>Er du sikker på at du vil slette nodene?"
-
-#, java-format
+#~ "Du er i ferd med å slette noder utenfor nedlastet område.<br>Dette kan "
+#~ "skape problemer fordi de kan være i bruk av andre objekter (som du ikke "
+#~ "kan se nå) .<br>Er du sikker på at du vil slette nodene?"
+
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Kan ikke åpne innstillingsmappe: {0}"
@@ -33765,5 +34033,4 @@
 #~ msgstr "Fant mer enn én \"via\"."
 
-#, java-format
 #~ msgid "Style for restriction {0} not found."
 #~ msgstr "Fant ikke stil for restriksjon {0}."
@@ -33783,5 +34050,6 @@
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you load\n"
+#~ "Parameters are read in the order they are specified, so make sure you "
+#~ "load\n"
 #~ "some data before --selection"
 #~ msgstr ""
@@ -33798,5 +34066,4 @@
 #~ msgstr "Fant ikke fila"
 
-#, java-format
 #~ msgid ""
 #~ "WARNING: launching browser windows for the first {0} of {1} selected "
@@ -33805,20 +34072,17 @@
 #~ "ADVARSEL: Starter leservindu kun for de første {0} av {1} valgte objektene"
 
-#, java-format
 #~ msgid ""
 #~ "Current number of changes exceeds the max. number of changes, current is "
 #~ "{0}, max is {1}"
 #~ msgstr ""
-#~ "Gjeldende antall endringer overstiger maksimalt antall endringer: gjeldende "
-#~ "er {0}, maksimalt er {1}"
+#~ "Gjeldende antall endringer overstiger maksimalt antall endringer: "
+#~ "gjeldende er {0}, maksimalt er {1}"
 
 #~ msgid "Failed to initialize API. Please try again later."
 #~ msgstr "Klarte ikke starte API. Prøv igjen senere."
 
-#, java-format
 #~ msgid "multipolygon way ''{0}'' is not closed."
 #~ msgstr "multipolygon-linje «{0}» er ikke lukket."
 
-#, java-format
 #~ msgid "Way ''{0}'' with less than two points."
 #~ msgstr "Linje «{0}» med færre enn to punkter."
@@ -33833,5 +34097,4 @@
 #~ msgstr "Fant mer enn én linje med «to»."
 
-#, java-format
 #~ msgid "No useful role ''{0}'' for Way ''{1}''."
 #~ msgstr "Ingen fornuftig rolle «{0}» for linje «{1}»."
@@ -33840,5 +34103,4 @@
 #~ msgstr "Fant ingen node eller linje med «via»."
 
-#, java-format
 #~ msgid "Non-Way ''{0}'' in multipolygon."
 #~ msgstr "Multipolygon-medlem «{0}» er ikke en linje."
@@ -33847,21 +34109,16 @@
 #~ msgstr "Fant ingen linje med «from»."
 
-#, java-format
 #~ msgid "Style for inner way ''{0}'' equals multipolygon."
 #~ msgstr "Stil for indre linje «{0}» er samme som multipolygon."
 
-#, java-format
 #~ msgid "Style for outer way ''{0}'' mismatches."
 #~ msgstr "Stil for ytre linje «{0}» passer ikke."
 
-#, java-format
 #~ msgid "No outer way for multipolygon ''{0}''."
 #~ msgstr "Ingen ytre linje for multipolygon «{0}»."
 
-#, java-format
 #~ msgid "Intersection between ways ''{0}'' and ''{1}''."
 #~ msgstr "Skjæring mellom linjene «{0}» og «{1}»."
 
-#, java-format
 #~ msgid "Inner way ''{0}'' is outside."
 #~ msgstr "Indre linje «{0}» er utenfor."
@@ -33876,9 +34133,11 @@
 #~ "Er du sikker på at du vil fortsette?"
 
-#, java-format
-#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
+#~ msgid ""
+#~ "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them all?"
-#~ msgstr[0] "Utvalget har {0} linje. Er du sikker på at du vil forenkle denne?"
+#~ "The selection contains {0} ways. Are you sure you want to simplify them "
+#~ "all?"
+#~ msgstr[0] ""
+#~ "Utvalget har {0} linje. Er du sikker på at du vil forenkle denne?"
 #~ msgstr[1] ""
 #~ "Utvalget har {0} linjer. Er du sikker på at du vil forenkle disse?"
@@ -33920,5 +34179,4 @@
 #~ msgstr "Objekt allerede slettet"
 
-#, java-format
 #~ msgid "removing reference from way {0}"
 #~ msgstr "fjerner henvisning fra vei {0}"
@@ -33933,5 +34191,4 @@
 #~ msgstr "OSM-brukernavn (e-post)"
 
-#, java-format
 #~ msgid "Plugin {0} requires JOSM update to version {1}."
 #~ msgstr "Programtillegg {0} krever JOSM-oppdatering til versjon {1}."
@@ -33995,10 +34252,10 @@
 #~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
 #~ msgstr ""
-#~ "Kilden (URL eller filnavn) på definisjonsfiler for objektmaler. Se "
-#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for hjelp."
+#~ "Kilden (URL eller filnavn) på definisjonsfiler for objektmaler. Se http://"
+#~ "josm.openstreetmap.de/wiki/TaggingPresets for hjelp."
 
 #~ msgid ""
-#~ "Tools to work with authors/users. Selects map data that belongs to selected "
-#~ "user, opens browser showing selected author profile page."
+#~ "Tools to work with authors/users. Selects map data that belongs to "
+#~ "selected user, opens browser showing selected author profile page."
 #~ msgstr ""
 #~ "Verktøy for å redigere opphavspersoner/brukere. Velger kartdata fra valgt "
@@ -34041,9 +34298,7 @@
 #~ msgstr "Feil antall parametere for nodes-operator."
 
-#, java-format
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "Klarte ikke lese fra URL: «{0}»"
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -34059,9 +34314,7 @@
 #~ "Ikke last opp data etter denne beskjeden."
 
-#, java-format
 #~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
 #~ msgstr "Klarte ikke lese tid «{0}» for punkt {1} x {2}"
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -34079,25 +34332,19 @@
 #~ "Ikke last opp data etter  denne meldingen."
 
-#, java-format
 #~ msgid "The date in file \"{0}\" could not be parsed."
 #~ msgstr "Klarte ikke tolke datoen i fila «{0}»."
 
-#, java-format
 #~ msgid "There is no EXIF time within the file \"{0}\"."
 #~ msgstr "Det er ikke noe EXIF-tidspunkt i fila «{0}»."
 
-#, java-format
 #~ msgid "Parsing error in URL: \"{0}\""
 #~ msgstr "Feil i URL: «{0}»"
 
-#, java-format
 #~ msgid "Unknown role ''{0}''."
 #~ msgstr "Ukjent rolle «{0}»."
 
-#, java-format
 #~ msgid "Unknown member type for ''{0}''."
 #~ msgstr "Ukjent medlemstype for «{0}»."
 
-#, java-format
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "Bruk objektmal «{0}» i gruppe «{1}»"
@@ -34106,23 +34353,21 @@
 #~ msgstr "AgPifoJ – Geotaggede  bilder"
 
-#, java-format
 #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 #~ msgstr "Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»"
 
-#, java-format
 #~ msgid ""
 #~ "<html>There are {0} primitives in your local dataset which<br>might be "
 #~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
-#~ "to check the state of these primitives<br>on the server.<br>Click "
+#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
+#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
 #~ "<strong>{2}</strong> to ignore.<br></html>"
 #~ msgstr ""
-#~ "<html>Det er {0} elementer i det lokale datasettet som<br>kan være slettet "
-#~ "på tjeneren. Hvis du senere prøver å slette<br>eller oppdatere dem, vil "
-#~ "tjeneren sannsynligvis rapportere om en<br>konflikt.<br><br>Trykk "
-#~ "<strong>{1}</strong> for å sjekke status for disse elementene<br>på "
-#~ "tjeneren.<br>Trykk <strong>{2}</strong> for å ignorere.<br></html>"
-
-#, java-format
+#~ "<html>Det er {0} elementer i det lokale datasettet som<br>kan være "
+#~ "slettet på tjeneren. Hvis du senere prøver å slette<br>eller oppdatere "
+#~ "dem, vil tjeneren sannsynligvis rapportere om en<br>konflikt."
+#~ "<br><br>Trykk <strong>{1}</strong> for å sjekke status for disse "
+#~ "elementene<br>på tjeneren.<br>Trykk <strong>{2}</strong> for å ignorere."
+#~ "<br></html>"
+
 #~ msgid ""
 #~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
@@ -34131,6 +34376,6 @@
 #~ msgstr ""
 #~ "<html>Opplasting <strong>feilet</strong> fordi et element du prøvde "
-#~ "å<br>slette allerede er slettet på "
-#~ "tjeneren.<br><br>Feilmelding:<br>{0}</html>"
+#~ "å<br>slette allerede er slettet på tjeneren.<br><br>Feilmelding:<br>{0}</"
+#~ "html>"
 
 #~ msgid "parameter '{0}' must not be null"
@@ -34140,5 +34385,4 @@
 #~ msgstr "Bruk ufullstendige løsninger"
 
-#, java-format
 #~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
 #~ msgstr "Uventet «type» for medlem {0} i relasjon {1} – leste {2}."
@@ -34154,6 +34398,6 @@
 
 #~ msgid ""
-#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
-#~ "these will then show up in the WMS menu.\n"
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
 #~ "\n"
 #~ "You can also do this manually in the Advanced Preferences, using the "
@@ -34169,6 +34413,6 @@
 #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
 #~ "only need to input the relevant 'id'.\n"
-#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in "
-#~ "this example, replacing 73 with your image id:\n"
+#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
+#~ "in this example, replacing 73 with your image id:\n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -34180,6 +34424,6 @@
 #~ "und löschen - Diese werden dann im WMS-Menü angezeigt. \n"
 #~ "\n"
-#~ "Sie können dies in den erweiterten Einstellungen auch manuell nach folgendem "
-#~ "Schema erledigen:\n"
+#~ "Sie können dies in den erweiterten Einstellungen auch manuell nach "
+#~ "folgendem Schema erledigen:\n"
 #~ "wmsplugin.url.1.name=LandSat\n"
 #~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
@@ -34198,8 +34442,7 @@
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
 #~ "\n"
-#~ "Achtung: Stellen Sie sicher, dass die Bilder urheberrechtlicht unbedenklich "
-#~ "sind. Im Zweifel verzichten Sie auf die Nutzung."
-
-#, java-format
+#~ "Achtung: Stellen Sie sicher, dass die Bilder urheberrechtlicht "
+#~ "unbedenklich sind. Im Zweifel verzichten Sie auf die Nutzung."
+
 #~ msgid "Layer {0} must be in list of layers"
 #~ msgstr "Lag {0} må være i listen over lag"
@@ -34217,12 +34460,10 @@
 #~ msgstr "feil ved fårespørsel om oppdatering: ikke zoom-nivå 12"
 
-#, java-format
 #~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr "Hjelpeside mangler. Opprett den på <A HREF=\"{0}\">engelsk</A>."
 
-#, java-format
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
 #~ msgstr ""
 #~ "Hjelpeside mangler. Opprett den på <A HREF=\"{0}\">engelsk</A> eller <A "
@@ -34233,23 +34474,19 @@
 
 #~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
 #~ msgstr ""
-#~ "Hjelp mangler. Kan lages i <A HREF=\"{0}\">English</A> ellerr <A "
-#~ "HREF=\"{1}\">norsk bokmål</A>."
-
-#, java-format
+#~ "Hjelp mangler. Kan lages i <A HREF=\"{0}\">English</A> ellerr <A HREF="
+#~ "\"{1}\">norsk bokmål</A>."
+
 #~ msgid "Parameter ''{0}'' must not be null."
 #~ msgstr "parameter «{0}» må ha en verdi"
 
-#, java-format
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "Uventet returverdi. Mottok {0}."
 
-#, java-format
 #~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
 #~ msgstr "Parameter «{0}» > 0 forventet – leste «{1}»."
 
-#, java-format
 #~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 #~ msgstr "parameter «{0}» er ikke en tillatt klasse – leste «{1}»"
@@ -34261,5 +34498,4 @@
 #~ msgstr "Denne historikken har ikke noen gyldig versjon for dato «{0}»"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 #~ msgstr "parameter «{0}» i intervall 0–{1} forventet – leste {2}"
@@ -34271,17 +34507,13 @@
 #~ msgstr "Fant ingen siste versjon. Historikken er tom."
 
-#, java-format
 #~ msgid "Parameter current out of range. Got {0}."
 #~ msgstr "parameter «current» utenfor rekkevidde: leste {0}"
 
-#, java-format
 #~ msgid "Unexpected column index. Got {0}."
 #~ msgstr "Uventet kolonneindeks: {0}"
 
-#, java-format
 #~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
 #~ msgstr "Parameter «col» må være 0 eller 1. Leste {0}."
 
-#, java-format
 #~ msgid "Index out of bounds. Got {0}."
 #~ msgstr "Indeks er utenfor rekkevidde: {0}"
@@ -34290,16 +34522,14 @@
 #~ msgstr "Vis historikken for det valgte objektet"
 
-#, java-format
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Klarte ikke lese «{0}»"
 
-#, java-format
 #~ msgid ""
-#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
+#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got "
+#~ "''{1}''."
 #~ msgstr ""
 #~ "ugyldig verdi for obligatorisk attributt «{0}» av type «int» (>= 0) – leste "
 #~ "«{1}»"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 #~ msgstr "parameter «{0}» >= 0 forventet – leste «{1}»"
Index: /applications/editors/josm/i18n/po/nl.po
===================================================================
--- /applications/editors/josm/i18n/po/nl.po	(revision 21970)
+++ /applications/editors/josm/i18n/po/nl.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:22+0000\n"
+"POT-Creation-Date: 2010-06-23 22:47+0200\n"
+"PO-Revision-Date: 2010-06-15 18:01+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-06-15 16:21+0000\n"
+"X-Launchpad-Export-Date: 2010-06-23 20:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -23,5 +23,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
@@ -93,5 +93,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
@@ -255,5 +255,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
@@ -276,5 +276,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
@@ -282,6 +282,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
@@ -290,4 +292,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
@@ -326,9 +330,9 @@
 #, java-format
 msgid ""
-"<html>There are no layers the source layer<br>''{0}''<br>could be merged "
-"to.</html>"
-msgstr ""
-"<html>Er zijn geen lagen waarmee de bron laag<br>''{0}''<br> kan "
-"samenvoegen.</html>"
+"<html>There are no layers the source layer<br>''{0}''<br>could be merged to."
+"</html>"
+msgstr ""
+"<html>Er zijn geen lagen waarmee de bron laag<br>''{0}''<br> kan samenvoegen."
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:81
@@ -351,9 +355,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
@@ -413,4 +417,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
@@ -450,5 +455,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 "Informatie"
@@ -663,5 +668,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
@@ -676,5 +681,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 "Verwijderen"
@@ -910,6 +915,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:126
 msgid "Please select at least one closed way that should be joined."
-msgstr ""
-"Selecteer op z'n minst één gesloten weg die samengevoegd moet worden."
+msgstr "Selecteer op z'n minst één gesloten weg die samengevoegd moet worden."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:132
@@ -924,4 +928,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 ""
@@ -932,4 +937,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 ""
@@ -1364,6 +1370,6 @@
 "orthogonalize them one by one.</html>"
 msgstr ""
-"<html>Zorg a.u.b. dat alle geselecteerde wegen dezelfde richting "
-"wijzen.<br>of zet ze één voor één orthogonaal.</html>"
+"<html>Zorg a.u.b. dat alle geselecteerde wegen dezelfde richting wijzen."
+"<br>of zet ze één voor één orthogonaal.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:417
@@ -1490,6 +1496,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
@@ -1516,4 +1522,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
@@ -1522,6 +1530,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 "Fout"
@@ -1637,6 +1645,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 ""
 "Statusrapport tonen met zinvolle informatie dat aan fouten geweten kan worden"
@@ -1673,8 +1680,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 "Jaâh, verwijder die knopen nou"
 
 #: ../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 "Knopen buiten de binnengehaalde kaarten verwijderen."
@@ -1683,5 +1692,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 "Neeêh, Niet doen!"
@@ -1689,16 +1699,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 "Selecteer minimaal één weg om te vereenvoudigen."
@@ -1707,13 +1722,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 ""
@@ -1722,8 +1740,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"
@@ -1733,4 +1753,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)"
@@ -1809,6 +1830,6 @@
 "this and correct it when necessary.</html>"
 msgstr ""
-"<html>Een relatie lidmaatschap is gekopieerd naar alle nieuwe "
-"wegen.<br>Controleer dit en corrigeer dit waar nodig.</html>"
+"<html>Een relatie lidmaatschap is gekopieerd naar alle nieuwe wegen."
+"<br>Controleer dit en corrigeer dit waar nodig.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
@@ -1869,6 +1890,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 ""
 "* een knoop die gebruikt is door meer dan één weg, en één van die wegen, of"
@@ -1943,9 +1963,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)"
@@ -1962,5 +1982,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
@@ -2026,5 +2046,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 "Geen aanpassingen aanwezig om te uploaden."
@@ -2042,14 +2061,14 @@
 msgstr "Verstuur alle wijzigingen in de huidige selectie naar de OSM server"
 
-#: ../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 "Controleren van ouders voor verwijderde objecten"
 
-#: ../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 "Lezen ouders van \"{0}\""
 
-#: ../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 "Controleren van verwijderde ouders in de lokale dataset"
@@ -2307,5 +2326,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
@@ -2426,6 +2445,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 ""
 "Afspeelstart verslepen en loslaten nabij track om het geluid vanaf daar af "
@@ -2564,5 +2583,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."
@@ -2611,6 +2630,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
-msgstr ""
-"<b>Lange straat</b> - ''Lange'' en ''straat'' in een sleutel of naam."
+msgstr "<b>Lange straat</b> - ''Lange'' en ''straat'' in een sleutel of naam."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
@@ -2631,6 +2649,6 @@
 "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
 msgstr ""
-"<b>type=*</b> - sleutel ''type'' met elke waarde. Probeer ook "
-"<b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
+"<b>type=*</b> - sleutel ''type'' met elke waarde. Probeer ook <b>*=value</"
+"b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
@@ -2682,6 +2700,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 ""
 
@@ -2963,10 +2981,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
@@ -3069,6 +3091,6 @@
 "conflict cannot be added.</html>"
 msgstr ""
-"<html>Laag ''{0}'' heeft reeds een conflikt voor "
-"primitief<br>''{1}''.<br>Dit conflikt kan niet worden toegevoegd.</html>"
+"<html>Laag ''{0}'' heeft reeds een conflikt voor primitief<br>''{1}''."
+"<br>Dit conflikt kan niet worden toegevoegd.</html>"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36
@@ -3092,5 +3114,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
@@ -3170,7 +3192,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 ""
 "Je staat op het punt knopen te verwijderen buiten het gebied dat je hebt "
@@ -3219,11 +3241,11 @@
 msgstr[1] "Verplaats {0} knooppunten"
 
-#: ../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 "Object \"{0}\" verwijderd"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111
 #, java-format
 msgid "Purged {0} object"
@@ -3232,5 +3254,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 #, java-format
 msgid ""
@@ -3239,5 +3261,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}"
@@ -3450,6 +3472,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 ""
 
@@ -3532,5 +3554,5 @@
 #. *
 #. * the decimal format 999.999
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3539,5 +3561,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3546,5 +3568,5 @@
 #. *
 #. * coordinates East/North
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3591,4 +3613,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}"
@@ -3600,30 +3625,24 @@
 msgstr "Samenvoeg doel voor object met id {0} ontbreekt"
 
-#: ../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 "Samenvoeg doel voor knooppunt met id {0} ontbreekt"
 
-#: ../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 "Samenvoeg doel voor relatie met id {0} ontbreekt"
 
-#: ../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 "Samenvoeg doel van type {0} met id {1} ontbreekt"
-
-#. 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 ""
 
 #. translators notes must be in front
@@ -3701,19 +3720,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 ""
@@ -3722,5 +3741,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 "
@@ -3728,5 +3747,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 ""
@@ -3782,6 +3801,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 ""
 
@@ -3796,5 +3814,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 "geselecteerd"
@@ -3958,6 +3976,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 ""
 
@@ -4028,5 +4045,5 @@
 #. color tiger_data
 #. </rule>
-#. 
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4036,5 +4053,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4043,5 +4060,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4050,5 +4067,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4057,5 +4074,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4064,5 +4081,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4071,9 +4088,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--annotation tags -->
-#. 
+#.
 #. <!--"work in progress" tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="building"/>
@@ -4082,5 +4099,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 "gebouw"
@@ -4167,5 +4184,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
@@ -4229,6 +4246,6 @@
 "filename"
 msgstr ""
-"Alles downloaden. Mogelijkheden: x1,y1,x2,y2, een URL met lat=y&lon=x&zoom=z "
-" of een bestandsnaam"
+"Alles downloaden. Mogelijkheden: x1,y1,x2,y2, een URL met "
+"lat=y&lon=x&zoom=z  of een bestandsnaam"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
@@ -4395,5 +4412,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
@@ -4402,4 +4419,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
@@ -4602,5 +4620,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
@@ -4639,6 +4657,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 ""
 
@@ -4669,5 +4687,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"
@@ -4676,5 +4694,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"
@@ -4683,5 +4701,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"
@@ -4895,6 +4913,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 ""
 
@@ -4974,6 +4991,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 ""
 
@@ -4981,6 +4998,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 ""
 
@@ -5031,6 +5048,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 ""
 
@@ -5247,10 +5264,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"
@@ -5259,10 +5278,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
@@ -5344,4 +5365,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 "geen"
@@ -5558,7 +5580,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 ""
 
@@ -5583,6 +5605,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 ""
 
@@ -5618,6 +5639,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74
 msgid "Open a list of all commands (undo buffer)."
-msgstr ""
-"Een lijst met alle mogelijk opdrachten openen (buffer ongedaan maken)."
+msgstr "Een lijst met alle mogelijk opdrachten openen (buffer ongedaan maken)."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
@@ -5629,5 +5649,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
@@ -5704,10 +5724,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 ""
 
@@ -5730,5 +5749,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
@@ -5736,5 +5755,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 "Toevoegen"
@@ -5783,5 +5802,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 "Geschiedenis"
@@ -6001,10 +6020,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 ""
@@ -6058,6 +6077,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:65
 msgid "Open a list of people working on the selected objects."
-msgstr ""
-"Een lijst openen met mensen die aan de geselecteerde objecten werken."
+msgstr "Een lijst openen met mensen die aan de geselecteerde objecten werken."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141
@@ -7462,6 +7480,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 ""
 
@@ -7485,8 +7503,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 ""
 
@@ -7606,9 +7624,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 "Eigenschappen toevoegen"
 
-#: ../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."
@@ -7617,23 +7635,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 "<verschillend>"
 
-#: ../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 "Waarden aanpassen?"
 
-#: ../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"
@@ -7642,5 +7660,5 @@
 msgstr[1] "Eigenschappen van {0} objecten aanpassen"
 
-#: ../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."
@@ -7649,77 +7667,77 @@
 msgstr[1] "Dit verandert {0} objecten."
 
-#: ../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 "Selecteer een sleutel"
 
-#: ../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 "Selecteer een waarde"
 
-#: ../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 "Selecteer de objecten waarvan de eigenschappen moet veranderen."
 
-#: ../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 "Eigenschappen/Lidmaatschappen"
 
-#: ../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 "Eigenschappen voor geselecteerde objecten."
 
 #. 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 "Lid van"
 
-#: ../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 "Eigenschappen: {0} / Leden: {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 "Eigenschappen / Leden"
 
-#: ../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 "Relatie wijzigen"
 
-#: ../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 "Uit relatie verwijderen"
 
-#: ../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 "Selectie uit relatie {0} zeker verwijderen?"
 
-#: ../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 "De geselecteerde sleutel in alle objecten verwijderen"
 
-#: ../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 "Eigenschappen verwijderen"
 
-#: ../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 "Een nieuwe sleutel/waarde aan alle objecten toevoegen"
 
-#: ../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 "De geselecteerde sleutelwaarde voor alle objecten bewerken"
 
-#: ../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 ""
@@ -7834,6 +7852,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 ""
 
@@ -7851,6 +7869,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 ""
 
@@ -8005,7 +8023,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 ""
 
@@ -8318,6 +8335,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222
 msgid "Download area too large; will probably be rejected by server"
-msgstr ""
-"Gebied te groot om te downloaden; server zal waarschijnlijk weigeren."
+msgstr "Gebied te groot om te downloaden; server zal waarschijnlijk weigeren."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225
@@ -8342,7 +8358,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 ""
 
@@ -8483,6 +8498,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 ""
 
@@ -8492,6 +8507,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 ""
 
@@ -8765,18 +8780,17 @@
 "version of one<br>of your nodes, ways, or relations.<br>The conflict is "
 "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click "
-"<strong>{4}</strong> to synchronize the conflicting primitive only.<br>Click "
-"<strong>{5}</strong> to synchronize the entire local dataset with the "
-"server.<br>Click <strong>{6}</strong> to abort and continue "
-"editing.<br></html>"
+"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
+"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
+"strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{6}</strong> to abort and continue editing.<br></html>"
 msgstr ""
 "<html>Versturen <strong>mislukt</strong> omdat de server een nieuwere versie "
 "van een <br>van uw knooppunten, wegen, of relaties heeft gevonden.<br>Het "
-"conflict is veroorzaakt door de <strong>{0}</strong> met id "
-"<strong>{1}</strong>,<br>de server heeft versie {2}, uw versie is "
-"{3}.<br><br>Klik <strong>{4}</strong> om alleen het foutieve item te "
-"synchronizeren.<br>Klik <strong>{5}</strong> om de volledige dataset met de "
-"server te synchronizeren.<br>Klik <strong>{6}</strong> om af te breken, en "
-"verder te gaan met aanpassingen.<br></html>"
+"conflict is veroorzaakt door de <strong>{0}</strong> met id <strong>{1}</"
+"strong>,<br>de server heeft versie {2}, uw versie is {3}.<br><br>Klik "
+"<strong>{4}</strong> om alleen het foutieve item te synchronizeren.<br>Klik "
+"<strong>{5}</strong> om de volledige dataset met de server te synchronizeren."
+"<br>Klik <strong>{6}</strong> om af te breken, en verder te gaan met "
+"aanpassingen.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
@@ -8790,14 +8804,13 @@
 msgid ""
 "<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click "
-"<strong>{0}</strong> to synchronize the entire local dataset with the "
-"server.<br>Click <strong>{1}</strong> to abort and continue "
-"editing.<br></html>"
+"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
+"</strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{1}</strong> to abort and continue editing.<br></html>"
 msgstr ""
 "<html>Versturen <strong>mislukt</strong> omdat de server een nieuwere versie "
-"van een <br>van uw knooppunten, wegen of relaties heeft "
-"gevonden.<br><br>Klik <strong>{0}</strong> om de volledige dataset te "
-"synchronizeren met de server.<br>Klik <strong>{1}</strong> om af te breken, "
-"en verder te gaan met aanpassingen.<br></html>"
+"van een <br>van uw knooppunten, wegen of relaties heeft gevonden."
+"<br><br>Klik <strong>{0}</strong> om de volledige dataset te synchronizeren "
+"met de server.<br>Klik <strong>{1}</strong> om af te breken, en verder te "
+"gaan met aanpassingen.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194
@@ -8838,8 +8851,8 @@
 msgstr ""
 "<html>Versturen <strong>mislukt </strong> omdat u node {0} probeerde te "
-"verwijderen. Deze is nog in gebruik in weg {1}.<br><br>Klik "
-"<strong>{2}</strong> om alle ouder wegen op te halen van knooppunt "
-"{0}.<br>Indien nodig zal JOSM conflikten aanmaken die u kunt oplossen met "
-"behulp van het Conflikt Oplossen venster.</html>"
+"verwijderen. Deze is nog in gebruik in weg {1}.<br><br>Klik <strong>{2}</"
+"strong> om alle ouder wegen op te halen van knooppunt {0}.<br>Indien nodig "
+"zal JOSM conflikten aanmaken die u kunt oplossen met behulp van het Conflikt "
+"Oplossen venster.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237
@@ -8851,6 +8864,5 @@
 #, java-format
 msgid "Warning: error header \"{0}\" did not match with an expected pattern"
-msgstr ""
-"Waarschuwing: fout kop \"{0}\" komt niet overeen met verwacht patroon"
+msgstr "Waarschuwing: fout kop \"{0}\" komt niet overeen met verwacht patroon"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
@@ -9051,5 +9063,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 ""
@@ -9057,6 +9069,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 ""
 
@@ -9141,6 +9152,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] ""
@@ -9154,6 +9165,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 "
@@ -9379,5 +9390,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9403,6 +9414,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 ""
 
@@ -9457,6 +9467,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 ""
 
@@ -9510,7 +9520,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 ""
 
@@ -9520,5 +9530,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9536,5 +9546,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..."
@@ -9545,6 +9555,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 ""
 "Negeer uitzondering omdat versturen afgebroken is. De uitzondering is: {0}"
@@ -9763,7 +9772,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 ""
 
@@ -9789,7 +9798,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 ""
 
@@ -9853,6 +9862,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 ""
 "<html>Onverwerkte GPS-gegevens uploaden als kaartgegevens kan schadelijk "
@@ -10036,6 +10045,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 ""
 
@@ -10095,7 +10104,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 ""
 "<html>Maak een opname van je GPS-ontvanger met de tijd weergegeven.<br>Toon "
@@ -10551,6 +10560,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
 msgid "Toggle visible state of the marker text and icons."
-msgstr ""
-"Zichtbaarheid van de markertekst en pictogrammen in- of uitschakelen."
+msgstr "Zichtbaarheid van de markertekst en pictogrammen in- of uitschakelen."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
@@ -10687,6 +10695,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 ""
 
@@ -10708,8 +10716,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 ""
 
@@ -10829,6 +10837,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 ""
 
@@ -10938,6 +10946,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 ""
 
@@ -11071,8 +11078,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 ""
 
@@ -11155,8 +11162,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 ""
 
@@ -11183,7 +11190,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 ""
 
@@ -11234,5 +11241,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 "Selecteer een rij om te verwijderen."
@@ -11273,6 +11280,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
 msgid "Start of track (will always do this if no other markers available)."
-msgstr ""
-"Trackstart (doet dit altijd als geen andere markers beschikbaar zijn)."
+msgstr "Trackstart (doet dit altijd als geen andere markers beschikbaar zijn)."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:52
@@ -11435,6 +11441,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
-msgstr ""
-"Afwijking van locatie (rood = hoog, groen = laag, indien beschikbaar)"
+msgstr "Afwijking van locatie (rood = hoog, groen = laag, indien beschikbaar)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
@@ -11608,6 +11613,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 ""
 "De richtingspijlen tekenen door te zoeken in tabellen i.p.v. ingewikkelde "
@@ -11672,6 +11676,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 ""
 "Anti-aliasing op het kaartbeeld toepassen, met een vloeiender uiterlijk als "
@@ -11746,5 +11749,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 "Ingebouwde standaarden ingeschakelen"
@@ -11764,6 +11767,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>:"
@@ -11888,6 +11890,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 ""
 
@@ -11900,9 +11902,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 ""
 
@@ -12048,6 +12050,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175
 msgid "You have to restart JOSM for some settings to take effect."
-msgstr ""
-"U dient JOSM opnieuw te starten om sommige instellingen te activeren."
+msgstr "U dient JOSM opnieuw te starten om sommige instellingen te activeren."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
@@ -12070,6 +12071,5 @@
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
-msgstr ""
-"De projectie {0} kon niet geactiveerd worden. Mercator wordt gebruikt"
+msgstr "De projectie {0} kon niet geactiveerd worden. Mercator wordt gebruikt"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
@@ -12204,6 +12204,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 ""
 
@@ -12214,5 +12214,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 ""
@@ -12222,18 +12222,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 ""
@@ -12242,5 +12242,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 ""
@@ -12249,5 +12249,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 ""
@@ -12256,9 +12256,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 "Voorinstellingenmenu sorteren"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
 msgid "Tagging Presets"
 msgstr "Tagvoorkeuzen"
@@ -12367,6 +12367,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 ""
 
@@ -12388,6 +12388,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 ""
 
@@ -12466,6 +12466,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 ""
 
@@ -12481,6 +12480,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 ""
 
@@ -12574,6 +12572,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 ""
 
@@ -12706,4 +12704,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 "Eigenschappen veranderen"
@@ -12869,5 +12868,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
@@ -12887,5 +12886,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}''"
@@ -13052,6 +13051,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 ""
 
@@ -13168,10 +13166,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 ""
@@ -13179,69 +13177,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 "Changeset sluiten"
 
-#: ../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}."
@@ -13419,4 +13417,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})"
@@ -13436,6 +13435,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 ""
 
@@ -13463,6 +13462,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 ""
 
@@ -13504,6 +13503,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 ""
 
@@ -13938,6 +13936,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 ""
 
@@ -14073,6 +14071,6 @@
 "An unexpected exception occurred that may have come from the ''{0}'' plugin."
 msgstr ""
-"Een onverwachte uitzondering is opgetreden, mogelijk afkomstig van de "
-"\"{0}\"-plugin."
+"Een onverwachte uitzondering is opgetreden, mogelijk afkomstig van de \"{0}"
+"\"-plugin."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
@@ -14149,6 +14147,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 ""
 
@@ -14215,5 +14212,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"
@@ -14296,6 +14293,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 ""
 
@@ -14303,7 +14300,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 ""
 
@@ -14311,7 +14308,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 ""
 
@@ -14319,8 +14316,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 ""
 
@@ -14340,7 +14337,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 ""
 
@@ -14409,7 +14406,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 ""
 
@@ -14421,7 +14417,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 ""
 
@@ -14453,6 +14449,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 ""
 
@@ -14959,6 +14955,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>"
@@ -14985,6 +14981,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"
@@ -15022,6 +15018,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"
@@ -15037,7 +15033,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"
@@ -15088,9 +15084,29 @@
 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 "Gebouwen"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#, fuzzy
+msgid "Rotate crosshair"
+msgstr "Rechtsom roteren"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#, fuzzy
+msgid "Advanced settings"
+msgstr "Uitgebreide voorkeuren"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#, fuzzy
+msgid "Building tag:"
+msgstr "Gebouw"
+
+#: ../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"
@@ -15099,35 +15115,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 "Openbare gebouw"
+
+#: ../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 ""
 
@@ -15273,6 +15298,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
 msgid "Replace original background by JOSM background color."
-msgstr ""
-"Oorspronkelijke achtergrond vervangen door achtergrondkleur van JOSM."
+msgstr "Oorspronkelijke achtergrond vervangen door achtergrondkleur van JOSM."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
@@ -15303,7 +15327,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--waterway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15313,5 +15337,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15321,5 +15345,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15335,5 +15359,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15343,5 +15367,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15349,8 +15373,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 "water"
@@ -15372,5 +15396,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15379,5 +15403,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15386,5 +15410,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15393,5 +15417,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15400,5 +15424,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15407,10 +15431,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 "adres"
@@ -15439,11 +15463,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 ""
 
@@ -15886,6 +15909,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 "Lege laag"
@@ -16070,4 +16093,52 @@
 msgstr "Geen GPX-gegevenslaag gevonden."
 
+#: ../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 "Dierentuin bewerken"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#, fuzzy
+msgid "Name:"
+msgstr "Naam"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#, fuzzy
+msgid "CmdLine:"
+msgstr "Coördinaten:"
+
+#: ../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
+#, fuzzy, java-format
+msgid "Delete tool \"{0}\"?"
+msgstr "Verwijder {0} weg"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:74
+msgid "Are you sure?"
+msgstr "Weet je het zeker?"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
+#, fuzzy
+msgid "New tool..."
+msgstr "Nieuwe rol"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
+#, fuzzy
+msgid "Install"
+msgstr "Industrieterrein"
+
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
 msgid "Position only"
@@ -16190,6 +16261,6 @@
 msgstr ""
 "Kan bibliotheek rxtxSerial niet laden. Als je ondersteuning bij het "
-"installeren nodig hebt, kijk dan op Globalsat: http://www.raphael-"
-"mack.de/josm-globalsat-gpx-import-plugin/"
+"installeren nodig hebt, kijk dan op Globalsat: http://www.raphael-mack.de/"
+"josm-globalsat-gpx-import-plugin/"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
@@ -16337,5 +16408,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#. 
+#.
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16456,6 +16527,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 ""
 "Maximum aantal segmenten toegestaan in een aangemaakte weg (standaard 250)."
@@ -16479,10 +16549,9 @@
 #: ../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."
-msgstr ""
-"Nauwkeurigheid van de Douglas-Peucker lijnvereenvoudiging, gemeten in "
-"graden.<br>Lagere waarden resulteren in meer knopen en nauwkeurigere lijnen. "
+"Accuracy of Douglas-Peucker line simplification, measured in degrees."
+"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
+msgstr ""
+"Nauwkeurigheid van de Douglas-Peucker lijnvereenvoudiging, gemeten in graden."
+"<br>Lagere waarden resulteren in meer knopen en nauwkeurigere lijnen. "
 "Standaard 0.0003."
 
@@ -16607,6 +16676,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
-msgstr ""
-"Met gpsd-server verbinden en de huidige locatie in LiveGPS-laag tonen."
+msgstr "Met gpsd-server verbinden en de huidige locatie in LiveGPS-laag tonen."
 
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
@@ -16781,7 +16849,7 @@
 "upload this data. Maybe you have selected the wrong layer?"
 msgstr ""
-"<html>De geselecteerde gegevens bevatten gegevens van "
-"OpenStreetBugs.<br>Deze gegevens kan je niet uploaden. Heb je misschien de "
-"verkeerde laag geselecteerd?"
+"<html>De geselecteerde gegevens bevatten gegevens van OpenStreetBugs."
+"<br>Deze gegevens kan je niet uploaden. Heb je misschien de verkeerde laag "
+"geselecteerd?"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
@@ -16796,6 +16864,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 ""
 "Kop bevat meerdere waarden en kan niet in een enkele string worden geplaatst"
@@ -16908,6 +16975,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 ""
 
@@ -16960,6 +17026,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 ""
 
@@ -17327,5 +17392,5 @@
 msgstr "Terugdraaien"
 
-#: ../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}"
@@ -17376,4 +17441,43 @@
 msgid "Revert changeset #{0}"
 msgstr ""
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:78
+#, fuzzy
+msgid "Road Sign Plugin"
+msgstr "Plugins laden"
+
+#: ../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 "Kan voorkeuzebron voor tagging niet lezen: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
+#, fuzzy, java-format
+msgid "Error parsing tagging preset from ''{0}'':\n"
+msgstr ""
+"Initialiseren test {0} is mislukt:\n"
+" {1}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:104
+#, fuzzy, java-format
+msgid "Sign {0}"
+msgstr "Selectie: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:111
+#, fuzzy, java-format
+msgid "Additional sign {0}"
+msgstr "Relatie {0} toevoegen"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -17480,4 +17584,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 "Weg vereenvoudigen"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
+#, fuzzy
+msgid "Delete unnecessary nodes from an area."
+msgstr "Ongebruikte knopen van een weg verwijderen."
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
 msgid "Slippy Map"
@@ -18269,6 +18384,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 ""
 
@@ -18354,8 +18469,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 ""
 
@@ -18409,8 +18524,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 ""
 
@@ -18522,6 +18637,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 ""
 
@@ -18529,6 +18644,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 ""
 
@@ -19190,11 +19305,10 @@
 #: ../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."
-msgstr ""
-"De bronnen (URL of bestandsnaam) van spellingscontrole (zie "
-"http://wiki.openstreetmap.org/index.php/User:JLS/speller) of "
-"gegevensbestanden van tagchecker."
+"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
+"org/index.php/User:JLS/speller) or tag checking data files."
+msgstr ""
+"De bronnen (URL of bestandsnaam) van spellingscontrole (zie http://wiki."
+"openstreetmap.org/index.php/User:JLS/speller) of gegevensbestanden van "
+"tagchecker."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
@@ -19389,9 +19503,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 "gebied"
@@ -19491,11 +19605,146 @@
 msgstr "{0}, ..."
 
-#: ../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
+#, fuzzy, java-format
+msgid "{0} {1}% of GPS track"
+msgstr "{0} bestaat uit {1} track"
+
+#: ../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 "Geluid importeren"
+
+#: ../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 "Verwijderen"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
+#, fuzzy
+msgid "removes current video from layer"
+msgstr "Foto uit laag verwijderen"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
+#, fuzzy
+msgid "play/pause"
+msgstr "Afspelen/Pauzeren"
+
+#: ../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 "achtergrond"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
+#, fuzzy
+msgid "jumps n sec back"
+msgstr "Spring terug"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "forward"
+msgstr "Vooruit"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "jumps n sec forward"
+msgstr "Naar voren springen"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
+#, fuzzy
+msgid "faster"
+msgstr "Sneller"
+
+#: ../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 "Langzamer"
+
+#: ../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 "De LiveGPS-laag continu op de huidige locatie centeren."
+
+#. 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
+#, fuzzy
+msgid "Jump length"
+msgstr "Spring daarheen"
+
+#: ../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
+#, fuzzy
+msgid "Loop length"
+msgstr "Lengte: "
+
+#: ../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 "Laag"
+
+#: ../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 ""
 
@@ -19711,28 +19960,28 @@
 "Dat kan tot foutieve coördinaten leiden."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
 msgid "Automatic downloading"
 msgstr "Automatisch downloaden"
 
-#: ../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 "WMS-laag ({0}), automatisch in zoom {1} downloaden"
 
-#: ../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 "WMS-laag ({0}), in zoom {1} downloaden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
 #, java-format
 msgid ""
@@ -19743,17 +19992,17 @@
 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 "Zichtbare tegels downloaden"
 
-#: ../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"
@@ -19761,97 +20010,97 @@
 "Het gevraagde gebied is te groot. Zoom iets in of verander de resolutie"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329
 msgid "Change resolution"
 msgstr "Resolutie veranderen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341
 msgid "Reload erroneous tiles"
 msgstr "Foutieve tegels herladen"
 
-#: ../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 "WMS-laag in bestand opslaan"
 
-#: ../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 "WMS-laag uit bestand laden"
 
-#: ../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 "Niet-ondersteunde WMS-bestandsversie; is {0}, verwachtte {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
 msgid "File Format Error"
 msgstr "Fout in bestandsindeling"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449
 msgid "Error loading file"
 msgstr "Laden bestand is mislukt"
 
-#: ../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 "Een lege WMS-laag openen om gegevens uit een bestand in te laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
 msgid "WMS Plugin Preferences"
 msgstr "Voorkeuren WMS-plugin"
 
-#: ../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 ""
 "Lijst met WMS-servers bewerken die in het WMS-pluginmenu worden getoond"
 
-#: ../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 "Menunaam"
 
-#: ../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 "WMS-URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "Menu Name (Default)"
 msgstr "Menunaam (standaard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "WMS URL (Default)"
 msgstr "WMS-URL (standaard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:86
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
 msgid "Enter a menu name and WMS URL"
 msgstr "Een menunaam en WMS-URL invoeren"
 
-#: ../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 ""
@@ -19867,4 +20116,8 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
 msgid "% of north:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186
+msgid "Simultaneous connections"
 msgstr ""
 
@@ -19877,7 +20130,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
@@ -19929,8 +20182,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 "bosbouw"
@@ -19947,7 +20200,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--boundary tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -19957,5 +20210,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -19998,5 +20251,5 @@
 #. color boundary
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -20006,5 +20259,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -20014,5 +20267,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -20022,15 +20275,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 "grens"
@@ -20046,5 +20299,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -20053,7 +20306,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--route tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -20063,5 +20316,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -20071,5 +20324,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -20079,5 +20332,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -20087,5 +20340,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -20095,5 +20348,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -20103,5 +20356,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -20111,12 +20364,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 "route"
@@ -20393,21 +20646,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 "
@@ -20417,10 +20669,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."
@@ -20428,5 +20680,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 "
@@ -20436,15 +20688,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 "
@@ -20453,5 +20705,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 "
@@ -20461,15 +20713,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"
@@ -20477,5 +20729,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."
@@ -20483,5 +20735,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 "
@@ -20490,5 +20742,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 "
@@ -20497,10 +20749,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."
@@ -20508,15 +20760,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 "
@@ -20525,10 +20778,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 "
@@ -20537,15 +20797,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 "
@@ -20555,10 +20815,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). "
@@ -20567,5 +20827,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) "
@@ -20574,5 +20834,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:89
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20581,10 +20841,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 "
@@ -20593,5 +20853,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 "
@@ -20601,5 +20861,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:97
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20608,15 +20868,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 "
@@ -20625,5 +20885,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:105
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21513,10 +21773,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 "rotonde"
@@ -21653,8 +21913,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"/>
@@ -21864,5 +22124,5 @@
 #. color motorroad
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21872,5 +22132,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21889,5 +22149,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21897,5 +22157,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21914,5 +22174,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -21922,5 +22182,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -21939,5 +22199,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -21947,5 +22207,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -21960,5 +22220,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -21976,8 +22236,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 "woongebied"
@@ -21992,5 +22252,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -21999,5 +22259,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--public_transport tags -->
 #. <rule>
@@ -22007,10 +22267,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 "toegangsweg"
@@ -22025,5 +22285,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -22032,5 +22292,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -22040,10 +22300,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 "werkzaamheden"
@@ -23049,9 +23309,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 "moeras"
@@ -23381,5 +23641,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -23389,5 +23649,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -23397,5 +23657,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -23405,5 +23665,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -23413,5 +23673,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -23421,5 +23681,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -23429,5 +23689,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -23438,5 +23698,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -23444,9 +23704,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 "spoor"
@@ -24856,5 +25116,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24864,5 +25124,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24872,5 +25132,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24880,5 +25140,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -25242,7 +25502,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--sport tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -25252,5 +25512,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -25260,5 +25520,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -25268,5 +25528,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -25276,5 +25536,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -25284,5 +25544,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -25292,5 +25552,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -25300,5 +25560,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -25308,5 +25568,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -25316,5 +25576,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -25324,5 +25584,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -25332,5 +25592,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -25340,5 +25600,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -25348,5 +25608,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -25356,5 +25616,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -25364,5 +25624,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -25372,5 +25632,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -25380,5 +25640,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -25388,5 +25648,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -25396,5 +25656,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -25404,5 +25664,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -25412,5 +25672,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -25420,5 +25680,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -25428,5 +25688,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -25436,5 +25696,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -25444,5 +25704,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -25452,5 +25712,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -25460,5 +25720,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -25468,5 +25728,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -25476,5 +25736,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -25484,5 +25744,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -25492,5 +25752,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -25500,5 +25760,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -25508,5 +25768,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -25516,5 +25776,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -25524,5 +25784,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -25532,5 +25792,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -25540,5 +25800,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -25548,5 +25808,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -25556,5 +25816,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -25564,5 +25824,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -25572,5 +25832,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -25580,5 +25840,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -25588,5 +25848,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -25596,5 +25856,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -25604,5 +25864,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -25612,33 +25872,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 "sport"
@@ -27316,7 +27576,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--landuse tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -27326,5 +27586,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -27334,5 +27594,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -27342,5 +27602,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -27350,5 +27610,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -27358,5 +27618,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -27366,5 +27626,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -27374,5 +27634,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -27382,12 +27642,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 "groen"
@@ -28803,5 +29063,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -28817,5 +29077,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28825,18 +29085,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 -->
@@ -28845,7 +29122,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- cycleway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28855,5 +29132,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28863,5 +29140,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28871,5 +29148,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28879,12 +29156,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 "fiets"
@@ -28911,5 +29189,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -28925,5 +29203,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -28933,5 +29211,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28940,13 +29218,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"/>
@@ -28957,11 +29243,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 "voet"
@@ -28980,8 +29267,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 "metro"
@@ -29093,9 +29380,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
@@ -29103,5 +29390,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,
@@ -29111,8 +29398,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
@@ -29126,5 +29413,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#. 
+#.
 #: build/trans_style.java:72
 msgid "standard"
@@ -29132,5 +29419,5 @@
 
 #. mappaint style named "standard"
-#. 
+#.
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -29179,6 +29466,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>
@@ -29258,5 +29545,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -29266,16 +29553,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 "vervallen"
@@ -29286,5 +29573,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -29293,5 +29580,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -29300,5 +29587,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -29314,5 +29601,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -29326,5 +29613,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -29333,5 +29620,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -29340,5 +29627,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -29347,5 +29634,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -29354,5 +29641,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -29361,5 +29648,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -29368,5 +29655,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxweight"/>
@@ -29375,5 +29662,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxheight"/>
@@ -29382,5 +29669,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -29389,5 +29676,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxlength"/>
@@ -29396,5 +29683,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -29403,5 +29690,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="minspeed"/>
@@ -29410,5 +29697,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxstay"/>
@@ -29417,5 +29704,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="toll"/>
@@ -29424,5 +29711,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="barrier"/>
@@ -29599,7 +29886,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- highway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -29613,5 +29900,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -29621,7 +29908,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- tracktype tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -29631,5 +29918,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -29639,5 +29926,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -29647,5 +29934,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -29655,10 +29942,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 "snelwegroute"
@@ -29669,5 +29956,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -29676,5 +29963,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -29684,5 +29971,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -29691,5 +29978,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -29698,5 +29985,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -29705,5 +29992,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -29712,5 +29999,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -29719,5 +30006,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -29726,5 +30013,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -29733,5 +30020,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -29740,5 +30027,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -29747,8 +30034,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 ""
@@ -29759,8 +30046,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 ""
@@ -29771,5 +30058,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -29778,8 +30065,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 "Omkeermogelijkheid"
@@ -29790,9 +30077,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 ""
@@ -29803,9 +30090,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 "rivierbank"
@@ -29816,8 +30103,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 "stroom"
@@ -29828,8 +30115,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 "dok"
@@ -29840,5 +30127,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29847,5 +30134,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29854,5 +30141,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29862,5 +30149,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29869,5 +30156,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29876,5 +30163,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29883,5 +30170,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29891,5 +30178,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29900,5 +30187,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -29908,7 +30195,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--man_made tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -29918,5 +30205,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -29926,5 +30213,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -29934,5 +30221,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -29943,5 +30230,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -29950,5 +30237,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -29958,5 +30245,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -29966,5 +30253,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -29974,5 +30261,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -29982,5 +30269,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -29990,5 +30277,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -29998,5 +30285,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -30006,5 +30293,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -30014,5 +30301,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -30022,18 +30309,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 "kunstmatig"
@@ -30043,9 +30330,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 ""
@@ -30056,7 +30343,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- railway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -30066,5 +30353,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -30073,5 +30360,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -30081,5 +30368,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -30088,5 +30375,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -30096,5 +30383,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -30104,10 +30391,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 "spoorwegpunt"
@@ -30118,5 +30405,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -30127,13 +30414,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 "ander spoor"
 
 #. color otherrail
-#: build/trans_style.java:1192
+#: build/trans_style.java:1217
 msgid "railover"
 msgstr "spoorovergang"
@@ -30144,5 +30431,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -30152,5 +30439,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30163,5 +30450,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30169,7 +30456,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 "oud spoor"
@@ -30180,5 +30467,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -30187,5 +30474,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -30194,5 +30481,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -30201,7 +30488,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aeroway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -30212,9 +30499,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 "luchtverbinding"
@@ -30225,8 +30512,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 "terminal"
@@ -30237,5 +30524,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -30245,8 +30532,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 "luchtverbinding_donker"
@@ -30257,8 +30544,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 "luchtverbinding_licht"
@@ -30269,5 +30556,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -30276,5 +30563,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -30283,7 +30570,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aerialway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -30293,5 +30580,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -30301,5 +30588,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -30309,5 +30596,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -30317,5 +30604,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -30325,10 +30612,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 "kabelbaan"
@@ -30339,11 +30626,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 "piste_eenvoudig"
@@ -30354,9 +30641,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 "piste_middelmatig"
@@ -30367,9 +30654,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 "piste_gevorderden"
@@ -30380,9 +30667,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 ""
@@ -30393,9 +30680,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 "piste_vrijekuur"
@@ -30406,9 +30693,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 "piste_beginner"
@@ -30419,7 +30706,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--power tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -30429,5 +30716,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -30436,5 +30723,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -30444,5 +30731,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -30452,5 +30739,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -30460,5 +30747,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -30468,5 +30755,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -30476,5 +30763,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -30484,5 +30771,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -30492,5 +30779,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -30500,5 +30787,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -30508,5 +30795,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -30516,5 +30803,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -30524,15 +30811,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 "kracht"
@@ -30542,9 +30829,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 "pijler"
@@ -30555,8 +30842,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 "pijplijn"
@@ -30566,7 +30853,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--leisure tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -30576,5 +30863,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -30584,5 +30871,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -30592,5 +30879,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -30600,5 +30887,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -30608,5 +30895,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -30616,5 +30903,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -30624,5 +30911,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -30632,5 +30919,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -30640,5 +30927,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -30648,5 +30935,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -30656,5 +30943,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -30664,5 +30951,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -30672,5 +30959,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -30680,5 +30967,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -30688,5 +30975,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -30696,17 +30983,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 "vrije tijd"
@@ -30716,9 +31003,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 "jachthaven"
@@ -30728,7 +31015,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--amenity tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -30738,5 +31025,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -30746,5 +31033,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -30754,5 +31041,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -30762,5 +31049,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -30770,5 +31057,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -30778,5 +31065,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -30786,5 +31073,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -30794,5 +31081,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -30802,5 +31089,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -30810,14 +31097,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 "voorziening"
@@ -30827,5 +31114,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30835,5 +31122,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30843,5 +31130,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30851,5 +31138,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30859,5 +31146,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30867,5 +31154,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30875,5 +31162,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30883,5 +31170,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30891,5 +31178,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30899,5 +31186,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -30907,5 +31194,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -30915,14 +31202,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 "voorziening_verkeer"
@@ -30932,5 +31219,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -30939,5 +31226,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -30947,5 +31234,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -30954,5 +31241,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -30962,5 +31249,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -30970,5 +31257,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -30978,5 +31265,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -30985,5 +31272,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -30993,5 +31280,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -31001,5 +31288,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -31009,5 +31296,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -31017,5 +31304,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -31024,5 +31311,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -31031,5 +31318,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -31038,5 +31325,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -31045,5 +31332,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -31052,5 +31339,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -31059,5 +31346,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -31066,5 +31353,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -31073,5 +31360,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -31080,5 +31367,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -31087,5 +31374,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -31094,5 +31381,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -31101,5 +31388,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -31108,5 +31395,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -31116,5 +31403,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -31124,5 +31411,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -31132,5 +31419,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -31140,5 +31427,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -31148,5 +31435,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -31156,5 +31443,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -31164,5 +31451,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -31172,5 +31459,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -31180,5 +31467,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -31189,5 +31476,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -31197,5 +31484,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -31205,5 +31492,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -31213,5 +31500,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -31221,5 +31508,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -31229,5 +31516,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -31237,5 +31524,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -31245,5 +31532,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -31253,5 +31540,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -31261,5 +31548,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -31269,5 +31556,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -31277,5 +31564,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -31285,5 +31572,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -31293,5 +31580,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -31301,5 +31588,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -31309,5 +31596,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"/>
@@ -31317,5 +31612,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -31325,5 +31620,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -31333,5 +31628,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -31341,5 +31636,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -31348,27 +31643,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 "voorziening_licht"
@@ -31378,5 +31674,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -31386,5 +31682,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -31394,12 +31690,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 "licht_water"
@@ -31409,5 +31705,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -31417,5 +31713,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -31425,5 +31721,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -31433,5 +31729,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -31441,5 +31737,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -31449,5 +31745,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -31457,11 +31753,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 "gezondheid"
@@ -31471,7 +31767,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--shop tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -31481,5 +31777,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -31489,5 +31785,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -31497,5 +31793,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -31505,5 +31801,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -31513,5 +31809,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -31521,5 +31817,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -31529,5 +31825,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -31537,5 +31833,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -31545,5 +31841,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -31553,5 +31849,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -31561,5 +31857,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -31569,5 +31865,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -31577,5 +31873,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -31585,5 +31881,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -31593,5 +31889,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -31601,5 +31897,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -31609,5 +31905,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -31617,5 +31913,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -31625,5 +31921,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -31633,5 +31929,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -31641,5 +31937,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -31649,5 +31945,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -31657,5 +31953,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -31665,5 +31961,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -31673,5 +31969,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -31681,5 +31977,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -31689,5 +31985,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -31697,5 +31993,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -31705,5 +32001,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -31713,5 +32009,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -31721,5 +32017,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -31729,5 +32025,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -31737,5 +32033,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -31745,5 +32041,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -31753,5 +32049,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -31761,5 +32057,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -31769,5 +32065,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -31777,5 +32073,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -31785,5 +32081,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -31793,5 +32089,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -31801,5 +32097,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -31809,31 +32105,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 "winkel"
@@ -31843,7 +32139,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--tourism tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31853,5 +32149,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31861,5 +32157,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31869,5 +32165,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31877,5 +32173,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31885,5 +32181,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31893,5 +32189,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31901,12 +32197,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 "hotel"
@@ -31916,5 +32212,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -31924,5 +32220,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -31932,5 +32228,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -31940,5 +32236,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -31948,5 +32244,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -31956,5 +32252,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -31965,5 +32261,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -31973,5 +32269,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- information tags -->
 #. <rule>
@@ -31981,5 +32277,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -31989,5 +32285,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -31996,5 +32292,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -32003,13 +32299,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 "toerisme"
@@ -32019,7 +32315,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--historic tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -32029,5 +32325,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -32037,5 +32333,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -32045,5 +32341,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -32053,5 +32349,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -32061,5 +32357,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -32069,5 +32365,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -32077,5 +32373,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -32085,5 +32381,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -32093,13 +32389,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 "historisch"
@@ -32109,8 +32405,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 "mijnbouw"
@@ -32121,8 +32417,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 "vuilstortplaats"
@@ -32133,5 +32429,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -32141,8 +32437,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 "estuarium"
@@ -32153,8 +32449,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 "landbouwgrond"
@@ -32165,6 +32461,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
-#. 
+#.
+#.
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -32174,8 +32470,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 "winkelcentrum"
@@ -32186,8 +32482,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 "industrieel"
@@ -32198,8 +32494,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 "braakliggend gebied"
@@ -32210,8 +32506,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 "ontwikkelingsgebied"
@@ -32222,8 +32518,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 "Rangeerterrein"
@@ -32234,5 +32530,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -32242,7 +32538,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--military tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -32252,5 +32548,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -32260,5 +32556,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -32268,5 +32564,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -32276,11 +32572,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 "militair gebruik"
@@ -32291,8 +32587,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 "begraafplaats"
@@ -32302,8 +32598,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 "berg of -heuveltop"
@@ -32314,9 +32610,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 "gletsjer"
@@ -32326,9 +32622,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 "vulkaan"
@@ -32338,5 +32634,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -32347,5 +32643,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -32355,5 +32651,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -32363,5 +32659,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -32371,5 +32667,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -32379,12 +32675,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 "Natuurlijk"
@@ -32394,9 +32690,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 "ruig land"
@@ -32406,9 +32702,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 "heide"
@@ -32418,9 +32714,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 "houtland"
@@ -32430,9 +32726,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 "slikgronden"
@@ -32442,9 +32738,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 "strand"
@@ -32455,5 +32751,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?
@@ -32479,5 +32775,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -32488,11 +32784,11 @@
 #. </rule>
 #. -->
-#. 
+#.
 #. <!--name tags -->
-#. 
+#.
 #. <!--preferences tags -->
-#. 
+#.
 #. <!--place tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -32502,5 +32798,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -32510,5 +32806,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -32518,5 +32814,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -32526,5 +32822,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -32534,5 +32830,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -32542,5 +32838,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -32550,5 +32846,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -32558,5 +32854,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -32566,5 +32862,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -32574,5 +32870,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -32582,5 +32878,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -32590,15 +32886,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 "plaats"
@@ -32608,9 +32904,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 ""
@@ -32701,5 +32997,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#. 
+#.
 #. Data type can be:
 #. node        - a node point
@@ -32707,28 +33003,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
@@ -32843,5 +33139,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#. 
+#.
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32854,5 +33150,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>
@@ -32877,6 +33173,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#. 
-#. 
+#.
+#.
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32885,6 +33181,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#. 
-#. 
+#.
+#.
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32899,6 +33195,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
@@ -32912,6 +33208,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
@@ -32931,6 +33227,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#. 
-#. 
+#.
+#.
 #. only for Japan
 #: build/trans_wms.java:39
@@ -32954,6 +33250,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
@@ -32998,5 +33294,4 @@
 #~ msgstr "Conflicten oplossen"
 
-#, java-format
 #~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
 #~ msgstr "Kan tijd \"{0}\" van punt {1} x {2} niet lezen."
@@ -33005,5 +33300,4 @@
 #~ msgstr "Voer weergegeven datum in (mm/dd/jjjj UU:MM:SS)"
 
-#, java-format
 #~ msgid "No time for point {0} x {1}"
 #~ msgstr "Geen tijd voor punt {0} x {1}"
@@ -33027,5 +33321,4 @@
 #~ msgstr "Openen in browser"
 
-#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Maak een melding bij {0}"
@@ -33033,12 +33326,13 @@
 #~ msgid "Include your steps to get to the error (as detailed as possible)!"
 #~ msgstr ""
-#~ "Beschrijf de gevolgde stappen die tot de fout leidde (zo precies mogelijk)!"
+#~ "Beschrijf de gevolgde stappen die tot de fout leidde (zo precies "
+#~ "mogelijk)!"
 
 #~ 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 ""
-#~ "Probeer te updaten naar de nieuwste versie van JOSM en alle plugins voordat "
-#~ "je de fout meldt."
+#~ "Probeer te updaten naar de nieuwste versie van JOSM en alle plugins "
+#~ "voordat je de fout meldt."
 
 #~ msgid "Be sure to include the following information:"
@@ -33049,6 +33343,6 @@
 #~ "some time."
 #~ msgstr ""
-#~ "Server antwoordde met interne fout. Verklein het gebied of probeer het later "
-#~ "nog eens."
+#~ "Server antwoordde met interne fout. Verklein het gebied of probeer het "
+#~ "later nog eens."
 
 #~ msgid "Error during parse."
@@ -33082,9 +33376,7 @@
 #~ msgstr "Uploaden..."
 
-#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Plugin niet gevonden: {0}"
 
-#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "Plugin vereist JOSM-update: {0}"
@@ -33094,11 +33386,12 @@
 #~ "setting the config option 'pluginmanager.warntime'.)"
 #~ msgstr ""
-#~ "(Je kunt het aantal dagen waarna deze waarschuwing verschijnt<br>instellen "
-#~ "via de configuratieoptie 'pluginmanager.warntime'.)"
+#~ "(Je kunt het aantal dagen waarna deze waarschuwing "
+#~ "verschijnt<br>instellen via de configuratieoptie 'pluginmanager."
+#~ "warntime'.)"
 
 #~ msgid "Hint: Some changes came from uploading new data to the server."
 #~ msgstr ""
-#~ "Tip: enkele wijzigingen zijn afkomstig uit het uploaden van nieuwe gegevens "
-#~ "naar de server."
+#~ "Tip: enkele wijzigingen zijn afkomstig uit het uploaden van nieuwe "
+#~ "gegevens naar de server."
 
 #~ msgid "Unsaved Changes"
@@ -33139,6 +33432,6 @@
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version selected "
-#~ "in the history list."
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
 #~ msgstr ""
 #~ "De staat van alle geselecteerde objecten terugdraaien naar de versie "
@@ -33154,5 +33447,4 @@
 #~ msgstr "Tijdzone GPS-unit (verschil t.o.v. de foto)"
 
-#, java-format
 #~ msgid "Images for {0}"
 #~ msgstr "Afbeeldingen van {0}"
@@ -33198,5 +33490,6 @@
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you load\n"
+#~ "Parameters are read in the order they are specified, so make sure you "
+#~ "load\n"
 #~ "some data before --selection"
 #~ msgstr ""
@@ -33207,5 +33500,4 @@
 #~ msgstr "In plaats van --download=<bbox> kun je ook osm://<bbox> opgegeven\n"
 
-#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -33217,5 +33509,4 @@
 #~ "{0}"
 
-#, java-format
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Kan plugin niet downloaden: {0} van {1}"
@@ -33233,5 +33524,4 @@
 #~ msgstr "EPSG:4326"
 
-#, java-format
 #~ msgid "Parsing error in URL: \"{0}\""
 #~ msgstr "Ontleedfout in URL: \"{0}\""
@@ -33244,6 +33534,6 @@
 
 #~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this as "
-#~ "a bug."
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
 #~ msgstr ""
 #~ "Interne fout: kan voorwaarden voor geen laag niet controleren. Rapporteer "
@@ -33251,9 +33541,9 @@
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still want "
-#~ "to merge them?"
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
 #~ msgstr ""
-#~ "De geselecteerde knopen behoren tot verschillende relaties. Wil je ze toch "
-#~ "samenvoegen?"
+#~ "De geselecteerde knopen behoren tot verschillende relaties. Wil je ze "
+#~ "toch samenvoegen?"
 
 #~ msgid "Merge nodes with different memberships?"
@@ -33266,11 +33556,10 @@
 #~ msgstr "Slechts één knoop geselecteerd"
 
-#, 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 ""
 #~ "De plugin {0} lijkt beschadigd of kan niet automatisch worden gedownload."
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -33289,5 +33578,4 @@
 #~ msgstr "Naar OSM uploaden..."
 
-#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -33296,6 +33584,6 @@
 #~ "{0}"
 #~ msgstr ""
-#~ "Plugin-archief is al beschikbaar. Wil je de huidige versie downloaden door "
-#~ "de bestaande te verwijderen?\n"
+#~ "Plugin-archief is al beschikbaar. Wil je de huidige versie downloaden "
+#~ "door de bestaande te verwijderen?\n"
 #~ "\n"
 #~ "{0}"
@@ -33304,41 +33592,31 @@
 #~ msgstr "Relatie bevat leeg lid."
 
-#, java-format
 #~ msgid "multipolygon way ''{0}'' is not closed."
 #~ msgstr "Multipolygone weg \"{0}\" is niet gesloten."
 
-#, java-format
 #~ msgid "No useful role ''{0}'' for Way ''{1}''."
 #~ msgstr "Geen zinvolle rol \"{0}\" voor weg \"{1}\"."
 
-#, java-format
 #~ msgid "Way ''{0}'' with less than two points."
 #~ msgstr "Weg \"{0}\" met minder dan twee punten."
 
-#, java-format
 #~ msgid "No outer way for multipolygon ''{0}''."
 #~ msgstr "Geen buitenweg voor multipolygoon \"{0}\"."
 
-#, java-format
 #~ msgid "Inner way ''{0}'' is outside."
 #~ msgstr "Binnenweg \"{0}\" is uitwendig."
 
-#, java-format
 #~ msgid "Style for outer way ''{0}'' mismatches."
 #~ msgstr "Stijl voor buitenweg \"{0}\" komt niet overeen."
 
-#, java-format
 #~ msgid "Error: {0}"
 #~ msgstr "Fout: {0}"
 
-#, java-format
 #~ msgid "Warning: {0}"
 #~ msgstr "Waarschuwing: {0}"
 
-#, java-format
 #~ msgid "Style for inner way ''{0}'' equals multipolygon."
 #~ msgstr "Stijl voor binnenweg \"{0}\" komt overeen met multipolygoon."
 
-#, java-format
 #~ msgid "Non-Way ''{0}'' in multipolygon."
 #~ msgstr "Niet-weg \"{0}\" in multipolygoon."
@@ -33359,5 +33637,4 @@
 #~ msgstr "update aanvragen is mislukt"
 
-#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} binnen de track."
@@ -33372,5 +33649,4 @@
 #~ msgstr "Afbeeldings-id Metacarta Map Rectifier"
 
-#, java-format
 #~ msgid "rectifier id={0}"
 #~ msgstr "rectifier-id={0}"
@@ -33381,6 +33657,6 @@
 
 #~ msgid ""
-#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
-#~ "these will then show up in the WMS menu.\n"
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
 #~ "\n"
 #~ "You can also do this manually in the Advanced Preferences, using the "
@@ -33397,6 +33673,6 @@
 #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
 #~ "only need to input the relevant 'id'.\n"
-#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in "
-#~ "this example,replacing 73 with your image id: \n"
+#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
+#~ "in this example,replacing 73 with your image id: \n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -33405,9 +33681,9 @@
 #~ "use."
 #~ msgstr ""
-#~ "Je kunt WMS-invoer in het tabblad WMSplugin-voorkeuren toevoegen, bewerken "
-#~ "en wissen - deze zullen in het WMS-menu getoond worden.\n"
+#~ "Je kunt WMS-invoer in het tabblad WMSplugin-voorkeuren toevoegen, "
+#~ "bewerken en wissen - deze zullen in het WMS-menu getoond worden.\n"
 #~ "\n"
-#~ "Je kunt dit ook handmatig doen in de Uitgebreide voorkeuren, gebruikmakend "
-#~ "van het volgende schema:\n"
+#~ "Je kunt dit ook handmatig doen in de Uitgebreide voorkeuren, "
+#~ "gebruikmakend van het volgende schema:\n"
 #~ "wmsplugin.url.1.name=Landsat\n"
 #~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
@@ -33421,14 +33697,13 @@
 #~ "Voor de Metacarta's Map Rectifier (http://labs.metacarta.com/rectifier/) "
 #~ "moet je de betreffende 'id' invoeren.\n"
-#~ "Om een  menuitem van Metacarta Map Rectifier toe te voegen, maak je een URL "
-#~ "volgens het volgende voorbeeld, waarbij 73 vervangen wordt door je eigen "
-#~ "afbeeldings-id: \n"
+#~ "Om een  menuitem van Metacarta Map Rectifier toe te voegen, maak je een "
+#~ "URL volgens het volgende voorbeeld, waarbij 73 vervangen wordt door je "
+#~ "eigen afbeeldings-id: \n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
 #~ " \n"
-#~ "Merk op: Weet zeker dat de afbeelding vrij is van copyrights. Bij twijfel: "
-#~ "niet gebruiken."
-
-#, java-format
+#~ "Merk op: Weet zeker dat de afbeelding vrij is van copyrights. Bij "
+#~ "twijfel: niet gebruiken."
+
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "Kan niet lezen van URL: \"{0}\""
@@ -33453,7 +33728,4 @@
 #~ "Weet je zeker dat je verder wilt gaan?"
 
-#~ msgid "Are you sure?"
-#~ msgstr "Weet je het zeker?"
-
 #~ msgid "Really mark this issue as ''done''?"
 #~ msgstr "Dit onderwerp zeker als ''uitgevoerd'' markeren?"
@@ -33465,5 +33737,6 @@
 #~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
 #~ msgstr ""
-#~ "<html>Ik kan een foto van mijn GPS-ontvanger maken.<br>Zou dat helpen?</html>"
+#~ "<html>Ik kan een foto van mijn GPS-ontvanger maken.<br>Zou dat helpen?</"
+#~ "html>"
 
 #~ msgid "All images"
@@ -33507,9 +33780,7 @@
 #~ "Opent het OpenStreetBugs-scherm en activeert de automatische download"
 
-#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "Auteurs: {0}"
 
-#, java-format
 #~ msgid "Layers: {0}"
 #~ msgstr "Lagen: {0}"
@@ -33522,6 +33793,7 @@
 #~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
 #~ msgstr ""
-#~ "De bronnen (URL of bestandsnaam) van bestanden met tagvoorkeuzedefinities. "
-#~ "Zie http://josm.openstreetmap.de/wiki/TaggingPresets voor hulp."
+#~ "De bronnen (URL of bestandsnaam) van bestanden met "
+#~ "tagvoorkeuzedefinities. Zie http://josm.openstreetmap.de/wiki/"
+#~ "TaggingPresets voor hulp."
 
 #~ msgid "Add a new tagging preset source to the list."
@@ -33531,5 +33803,4 @@
 #~ msgstr "Bronnen tagvoorkeuzen"
 
-#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Kan voorkeurenmap niet openen: {0}"
@@ -33599,5 +33870,4 @@
 #~ msgstr "Oppervlak van weg is niet gesloten."
 
-#, java-format
 #~ msgid "Intersection between ways ''{0}'' and ''{1}''."
 #~ msgstr "Kruising tussen wegen \"{0}\" en \"{1}\"."
@@ -33606,23 +33876,22 @@
 #~ msgstr "onwaar"
 
-#, java-format
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Los {0} conflicten in {1} objecten op"
 
 #~ msgid ""
-#~ "You are about to delete nodes outside of the area you have "
-#~ "downloaded.<br>This can cause problems because other objects (that you don't "
-#~ "see) might use them.<br>Do you really want to delete?"
+#~ "You are about to delete nodes outside of the area you have downloaded."
+#~ "<br>This can cause problems because other objects (that you don't see) "
+#~ "might use them.<br>Do you really want to delete?"
 #~ msgstr ""
 #~ "Je staat op het punt knopen te verwijderen buiten het gebied dat je hebt "
-#~ "gedownload.<br>Dit kan problemen veroorzaken omdat andere objecten (die je "
-#~ "niet ziet) ze kunnen gebruiken.<br>Wil je ze echt verwijderen?"
+#~ "gedownload.<br>Dit kan problemen veroorzaken omdat andere objecten (die "
+#~ "je niet ziet) ze kunnen gebruiken.<br>Wil je ze echt verwijderen?"
 
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want to "
-#~ "combine them?"
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
 #~ msgstr ""
-#~ "De geselecteerde wegen zijn onderdeel van niet verschillende relaties. Weet "
-#~ "u zeker dat u ze wilt combineren?"
+#~ "De geselecteerde wegen zijn onderdeel van niet verschillende relaties. "
+#~ "Weet u zeker dat u ze wilt combineren?"
 
 #~ msgid "Combine ways with different memberships?"
@@ -33641,5 +33910,4 @@
 #~ msgstr "E-mail"
 
-#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "Verbinden met {0}..."
@@ -33657,13 +33925,10 @@
 #~ msgstr "Kan alleen hulppagina's van JOSM Online-hulp bewerken"
 
-#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Fout tijdens het laden van {0}"
 
-#, java-format
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "Voorkeuze ''{0}'' van groep ''{1}'' gebruiken"
 
-#, java-format
 #~ msgid "Use preset ''{0}''"
 #~ msgstr "Voorkeuze ''{0}'' gebruiken"
@@ -33676,19 +33941,16 @@
 
 #~ 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 ""
 #~ "Het activeren van de bijgewerkte plugins is mislukt. Controleer of JOSM "
 #~ "rechten heeft om de bestaande plugins te overschrijven."
 
-#, java-format
 #~ msgid "GPS start: {0}"
 #~ msgstr "GPS-start: {0}"
 
-#, java-format
 #~ msgid "GPS end: {0}"
 #~ msgstr "GPS-einde: {0}"
 
-#, java-format
 #~ msgid "current delta: {0}s"
 #~ msgstr "Huidige verschil: {0}s"
@@ -33697,9 +33959,7 @@
 #~ msgstr "Klok synchroniseren"
 
-#, java-format
 #~ msgid "The date in file \"{0}\" could not be parsed."
 #~ msgstr "De datum in het bestand \"{0}\" kon niet ontleed worden."
 
-#, java-format
 #~ msgid "There is no EXIF time within the file \"{0}\"."
 #~ msgstr "Er bevindt zich geen EXIF-tijd in het bestand \"{0}\"."
@@ -33713,9 +33973,7 @@
 #~ "Wachtwoord van het OSM-account. Laat leeg om wachtwoord niet te bewaren."
 
-#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Opdrachtenlijst: {0}"
 
-#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -33738,8 +33996,9 @@
 #~ msgstr "Hulp / Over"
 
-#, java-format
-#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
+#~ msgid ""
+#~ "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them all?"
+#~ "The selection contains {0} ways. Are you sure you want to simplify them "
+#~ "all?"
 #~ msgstr[0] ""
 #~ "De selectie bevat {0} weg. Weet je zeker dat je deze wilt vereenvoudigen?"
@@ -33781,5 +34040,4 @@
 #~ msgstr "fietskaart"
 
-#, java-format
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr "Een weg overslaan omdat het een niet bestaande knoop bevat: {0}\n"
@@ -33832,5 +34090,4 @@
 #~ msgstr "Geen \"naar\"-weg gevonden."
 
-#, java-format
 #~ msgid "Style for restriction {0} not found."
 #~ msgstr "Stijl voor beperking {0} is niet gevonden."
@@ -33839,9 +34096,7 @@
 #~ msgstr "Geen \"van\"-weg gevonden."
 
-#, java-format
 #~ msgid "Unknown role ''{0}''."
 #~ msgstr "Onbekende rol \"{0}\"."
 
-#, java-format
 #~ msgid "Unknown member type for ''{0}''."
 #~ msgstr "Onbekend lidtype voor \"{0}\"."
@@ -33867,19 +34122,17 @@
 
 #~ 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 ""
-#~ "Een speciale bewerker van de Franse kadaster WMS op "
-#~ "www.cadastre.gouv.fr<BR><BR>Lees de gebruiksvoorwaarden (in het Frans): "
-#~ "<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>voor het uploaden van gegevens die met deze plugin zijn gemaakt."
+#~ "Een speciale bewerker van de Franse kadaster WMS op www.cadastre.gouv."
+#~ "fr<BR><BR>Lees de gebruiksvoorwaarden (in het Frans): <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>voor het uploaden van gegevens die met deze plugin zijn "
+#~ "gemaakt."
 
 #~ msgid "sports"
@@ -33895,5 +34148,4 @@
 #~ msgstr "Omlaag bewegen"
 
-#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Relatie-editor: {0}"
@@ -33924,15 +34176,14 @@
 #~ msgstr "Toch samenvoegen"
 
-#, java-format
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
 #~ "continue?"
 #~ msgstr ""
-#~ "Deze opdracht zal {0} individuele downloadverzoeken vereisen. Toch doorgaan?"
+#~ "Deze opdracht zal {0} individuele downloadverzoeken vereisen. Toch "
+#~ "doorgaan?"
 
 #~ msgid "Update Data"
 #~ msgstr "Gegevens bijwerken"
 
-#, java-format
 #~ msgid "Change the projection to {0} first."
 #~ msgstr "Verander eerste de projectie in {0}."
@@ -33951,5 +34202,4 @@
 #~ "DIT IS EXPERIMENTEEL. Sla je werk op en controleer het vóór uploaden."
 
-#, java-format
 #~ msgid "Found {0} matches of {1} in GPX track {2}"
 #~ msgstr "{0} overeenkomsten van {1} gevonden in GPX-track {2}"
@@ -33959,6 +34209,6 @@
 
 #~ msgid ""
-#~ "An error occured while trying to match the photos to the GPX track. You can "
-#~ "adjust the sliders to manually match the photos."
+#~ "An error occured while trying to match the photos to the GPX track. You "
+#~ "can adjust the sliders to manually match the photos."
 #~ msgstr ""
 #~ "Het koppelen van de foto's aan de GPX-track is mislukt. Je kunt de "
@@ -33966,8 +34216,9 @@
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data layer?"
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
 #~ msgstr ""
-#~ "Geen gegevens gevonden om te updaten. Heeft u al een gegevenslaag geopend of "
-#~ "gedownload?"
+#~ "Geen gegevens gevonden om te updaten. Heeft u al een gegevenslaag geopend "
+#~ "of gedownload?"
 
 #~ msgid "Errors during Download"
@@ -34001,5 +34252,4 @@
 #~ msgstr "Valhek bewerken"
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -34023,11 +34273,10 @@
 #~ msgstr ">"
 
-#, java-format
 #~ msgid ""
 #~ "Current number of changes exceeds the max. number of changes, current is "
 #~ "{0}, max is {1}"
 #~ msgstr ""
-#~ "Het aantal wijzigingen overschrijdt het maximum, huidig is {0}, maximum is "
-#~ "{1}"
+#~ "Het aantal wijzigingen overschrijdt het maximum, huidig is {0}, maximum "
+#~ "is {1}"
 
 #~ msgid "Conflicts in data"
@@ -34043,9 +34292,7 @@
 #~ msgstr "Help-pagina ontbreekt. Maak het in <A HREF=\"{0}\">nederlands</A>."
 
-#, java-format
 #~ msgid "Parameter ''{0}'' must not be null."
 #~ msgstr "Parameter \"{0}\" mag niet leeg zijn."
 
-#, java-format
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Kan \"{0}\" niet lezen"
@@ -34054,11 +34301,10 @@
 #~ msgstr "Update selectie"
 
-#, java-format
 #~ msgid ""
 #~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
 #~ "resolve them first.</html>"
 #~ msgstr ""
-#~ "<html>Er zijn onopgeloste conflicten in laag ''{0}''.<br>U dient deze eerst "
-#~ "op te lossen</html>"
+#~ "<html>Er zijn onopgeloste conflicten in laag ''{0}''.<br>U dient deze "
+#~ "eerst op te lossen</html>"
 
 #~ msgid "Upload to OSM API failed"
@@ -34074,9 +34320,7 @@
 #~ msgstr "Error tijdens het communiceren met de server."
 
-#, java-format
 #~ msgid "Id > 0 required, got {0}"
 #~ msgstr "Id > 0 benodigd, kreeg {0}"
 
-#, java-format
 #~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 #~ msgstr "Verwachtte instantie van OsmDataLaag of GxpLaag. Kreeg \"{0}\"."
@@ -34085,5 +34329,4 @@
 #~ msgstr "Aanpassen primitief"
 
-#, java-format
 #~ msgid "Uploading {0} objects ..."
 #~ msgstr "Versturen van {0} objecten ..."
@@ -34092,26 +34335,24 @@
 #~ msgstr "Verwijderde of verplaatste primitieven"
 
-#, java-format
 #~ msgid ""
 #~ "<html>There are {0} primitives in your local dataset which<br>might be "
 #~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
-#~ "to check the state of these primitives<br>on the server.<br>Click "
+#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
+#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
 #~ "<strong>{2}</strong> to ignore.<br></html>"
 #~ msgstr ""
-#~ "<html>Er zijn {0} primitieven in uw lokale dataset die<br>verwijderd zouden "
-#~ "kunnen zijn op de server. Indien u deze later probeert te verwijderen of "
-#~ "wijzigen<br>zal de server waarschijnlijk een <br>conflikt "
+#~ "<html>Er zijn {0} primitieven in uw lokale dataset die<br>verwijderd "
+#~ "zouden kunnen zijn op de server. Indien u deze later probeert te "
+#~ "verwijderen of wijzigen<br>zal de server waarschijnlijk een <br>conflikt "
 #~ "rapporteren.<br><br>Klik <strong>{1}</strong> om de staat van deze "
-#~ "primitieven<br>op de server te controleren.<br>Klik <strong>{2}</strong> om "
-#~ "te negeren.<br></html>"
+#~ "primitieven<br>op de server te controleren.<br>Klik <strong>{2}</strong> "
+#~ "om te negeren.<br></html>"
 
 #~ msgid "Wrong number of parameters for tags operator."
 #~ msgstr "Verkeerd aantal parameters voor tags operator"
 
-#, java-format
 #~ msgid ""
-#~ "Incorrect value of tags operator: {0}. Tags operator expects number of tags "
-#~ "or range, for example tags:1 or tags:2-5"
+#~ "Incorrect value of tags operator: {0}. Tags operator expects number of "
+#~ "tags or range, for example tags:1 or tags:2-5"
 #~ msgstr ""
 #~ "Onjuist aantal waardes voor tags operator: {0}. Tags operator verwacht "
@@ -34121,9 +34362,7 @@
 #~ msgstr "Onjuit aantal parameters voor knooppunten operator"
 
-#, java-format
 #~ msgid "Incorrect value of id operator: {0}. Number is expected."
 #~ msgstr "Onjuiste waarde van id operator: {0}. Verwachtte nummer"
 
-#, java-format
 #~ msgid ""
 #~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
@@ -34133,9 +34372,7 @@
 #~ "verwacht aantal knooppunten, of bereik, bijvoorbeeld knooppunten:10-20"
 
-#, java-format
 #~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
 #~ msgstr "Patroon syntax fout: Patroon {0} in {1} is illegaal!"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' must not be empty"
 #~ msgstr "Parameter \"{0}\" mag niet leeg zijn"
Index: /applications/editors/josm/i18n/po/pl.po
===================================================================
--- /applications/editors/josm/i18n/po/pl.po	(revision 21970)
+++ /applications/editors/josm/i18n/po/pl.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 18:53+0000\n"
+"POT-Creation-Date: 2010-06-23 22:47+0200\n"
+"PO-Revision-Date: 2010-06-15 17:04+0000\n"
 "Last-Translator: Paweł Marynowski <yarl@o2.pl>\n"
 "Language-Team: Polish <josm-lang-pl@googlegroups.com>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-06-15 16:20+0000\n"
+"X-Launchpad-Export-Date: 2010-06-23 20:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: POLAND\n"
@@ -27,5 +27,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
@@ -97,5 +97,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
@@ -257,5 +257,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
@@ -278,5 +278,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
@@ -284,6 +284,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
@@ -292,4 +294,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
@@ -327,6 +331,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 ""
 "<html>Nie ma warstw, z którymi można by połączyć warstwę "
@@ -352,9 +356,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
@@ -414,4 +418,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
@@ -451,5 +456,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 "Informacje"
@@ -663,5 +668,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
@@ -676,5 +681,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 "Usuń"
@@ -922,9 +927,9 @@
 #, java-format
 msgid "\"{0}\" is not closed and therefore cannot be joined."
-msgstr ""
-"\"{0}\" nie jest połączona i z tego powodu nie można połączyć obszarów"
+msgstr "\"{0}\" nie jest połączona i z tego powodu nie można połączyć obszarów"
 
 #: ../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 ""
@@ -936,4 +941,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 "Może to spowodować przypadkowe usunięcie węzłów."
@@ -1493,6 +1499,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
@@ -1519,4 +1525,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
@@ -1525,6 +1533,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 "Błąd"
@@ -1638,6 +1646,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 ""
 "Pokazuje raport zawierający użyteczne informacje, które mogą być dołączone "
@@ -1675,8 +1682,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 "Tak, usuń węzły"
 
 #: ../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 ""
@@ -1685,5 +1694,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 "Nie, przerwij"
@@ -1691,16 +1701,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 "Anuluj operację"
 
 #: ../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 "Czy chcesz je usunąć mimo to?"
 
 #: ../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 "Skasować węzły spoza obszaru danych?"
 
 #: ../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 ""
@@ -1709,13 +1724,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 "Tak"
 
 #: ../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 "Uprość wszystkie zaznaczone drogi"
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:126
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:89
 #, java-format
 msgid ""
@@ -1724,8 +1742,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 "Uprościć drogi?"
 
 #: ../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"
@@ -1736,4 +1756,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)"
@@ -1867,6 +1888,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 ""
 "* Jeden węzeł, który jest użyty przez więcej niż jedną drogę oraz jedną z "
@@ -1938,9 +1958,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)"
@@ -1957,5 +1977,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
@@ -2021,5 +2041,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 "Brak zmian do wysłania."
@@ -2037,14 +2056,14 @@
 msgstr "Wysyła wszystkie zmiany zaznaczone na warstwie danych do serwera OSM"
 
-#: ../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 ""
@@ -2300,5 +2319,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
@@ -2418,6 +2437,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 ""
 
@@ -2505,6 +2524,6 @@
 "move zoom with right button"
 msgstr ""
-"Powiększaj przeciągając lub przez Ctrl+. lub Ctrl+,; przesuwanie - "
-"Ctrl+góra, lewo, dół, prawo; przesuń powiększenie prawym przyciskiem"
+"Powiększaj przeciągając lub przez Ctrl+. lub Ctrl+,; przesuwanie - Ctrl"
+"+góra, lewo, dół, prawo; przesuń powiększenie prawym przyciskiem"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48
@@ -2554,5 +2573,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."
@@ -2671,6 +2690,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 ""
 
@@ -2935,10 +2954,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
@@ -3061,5 +3084,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
@@ -3141,7 +3164,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 ""
 "Zamierzasz usunąć węzły spoza obszaru, który pobrano.<br>Może to spowodowac "
@@ -3191,11 +3214,11 @@
 msgstr[2] "Przesunięto {0} węzłów"
 
-#: ../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"
@@ -3204,5 +3227,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 #, java-format
 msgid ""
@@ -3211,5 +3234,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}"
@@ -3431,6 +3454,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 ""
 "<html>Plik ustawień  zawiera błędy. <br> Tworzenie kopii zapasowej starego "
@@ -3517,5 +3540,5 @@
 #. *
 #. * the decimal format 999.999
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3524,5 +3547,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3531,5 +3554,5 @@
 #. *
 #. * coordinates East/North
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3579,4 +3602,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}"
@@ -3588,29 +3614,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 ""
 
@@ -3687,22 +3707,21 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:462
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
-msgstr ""
-"</p><p>Zamknij okno filtrów aby zobaczyć wszystkie obiekty.<p></html>"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:498
+msgstr "</p><p>Zamknij okno filtrów aby zobaczyć wszystkie obiekty.<p></html>"
+
+#: ../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 "Oczekiwano ID > 0. Jest {0}."
 
-#: ../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 ""
@@ -3711,5 +3730,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 "
@@ -3717,5 +3736,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 ""
@@ -3774,6 +3793,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 ""
 
@@ -3788,5 +3806,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 "zaznaczony"
@@ -3950,6 +3968,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 ""
 
@@ -4021,5 +4038,5 @@
 #. color tiger_data
 #. </rule>
-#. 
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4029,5 +4046,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4036,5 +4053,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4043,5 +4060,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4050,5 +4067,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4057,5 +4074,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4064,9 +4081,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--annotation tags -->
-#. 
+#.
 #. <!--"work in progress" tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="building"/>
@@ -4075,5 +4092,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 "budynek"
@@ -4161,5 +4178,5 @@
 msgstr "Obiekt usunięty"
 
-#: ../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
@@ -4379,5 +4396,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
@@ -4386,4 +4403,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
@@ -4528,6 +4546,5 @@
 msgid ""
 "partial: different selected objects have different values, do not change"
-msgstr ""
-"częściowe: różne zaznaczone obiekty mają różne wartości - nie zmienia"
+msgstr "częściowe: różne zaznaczone obiekty mają różne wartości - nie zmienia"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:101
@@ -4540,6 +4557,6 @@
 "relation</strong>.</html>"
 msgstr ""
-"<html>Potwierdź usunięcie <strong>1 obiektu</strong> z <strong>1 "
-"relacji</strong>.</html>"
+"<html>Potwierdź usunięcie <strong>1 obiektu</strong> z <strong>1 relacji</"
+"strong>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152
@@ -4550,6 +4567,6 @@
 "relations</strong>.</html>"
 msgstr ""
-"<html>Potwierdź usunięcie <strong>1  obiektu</strong> z <strong>{0} "
-"relacji</strong>.</html>"
+"<html>Potwierdź usunięcie <strong>1  obiektu</strong> z <strong>{0} relacji</"
+"strong>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156
@@ -4591,5 +4608,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
@@ -4611,6 +4628,6 @@
 "level.</html>"
 msgstr ""
-"<html>Wybierz <strong>zakres kafelków OSM</strong> przy danym "
-"powiększeniu.</html>"
+"<html>Wybierz <strong>zakres kafelków OSM</strong> przy danym powiększeniu.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
@@ -4630,6 +4647,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 ""
 "<html>Możesz też podać <strong>adres kafelka</strong> dla pojedyńczego "
@@ -4665,5 +4682,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"
@@ -4672,5 +4689,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"
@@ -4679,5 +4696,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"
@@ -4893,6 +4910,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 ""
 
@@ -4972,6 +4988,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 ""
 
@@ -4979,6 +4995,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 ""
 
@@ -5032,6 +5048,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 ""
 
@@ -5248,10 +5264,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"
@@ -5260,10 +5278,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
@@ -5345,4 +5365,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 ""
@@ -5511,6 +5532,6 @@
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
 msgstr ""
-"<html>Wprowadź wartość dla tagu np. <strong><tt>sprawdź członków "
-"relacji</tt></strong></html>"
+"<html>Wprowadź wartość dla tagu np. <strong><tt>sprawdź członków relacji</"
+"tt></strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
@@ -5526,6 +5547,6 @@
 "zdecydować czy chcesz <strong>zachować</strong> to członkostwo dla łączonych "
 "dróg lub <strong>usunąć</strong> je z relacji.<br>Domyślnie "
-"<strong>zachowywana</strong> jest pierwsza droga a <strong>usuwane "
-"są</strong> inne drogi które są członkami tej samej relacji. W rezultacie "
+"<strong>zachowywana</strong> jest pierwsza droga a <strong>usuwane są</"
+"strong> inne drogi które są członkami tej samej relacji. W rezultacie "
 "połączona droga zastępuje pierwotne drogi w relacji</html>"
 
@@ -5570,7 +5591,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 ""
 
@@ -5595,6 +5616,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 ""
 
@@ -5640,5 +5660,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
@@ -5711,10 +5731,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 ""
 
@@ -5737,5 +5756,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
@@ -5743,5 +5762,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"
@@ -5790,5 +5809,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 "Historia"
@@ -6008,10 +6027,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 ""
@@ -7469,6 +7488,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 ""
 
@@ -7492,8 +7511,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 ""
 
@@ -7613,9 +7632,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 "Dodaj właściwości"
 
-#: ../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."
@@ -7625,23 +7644,23 @@
 msgstr[2] "Zmiana zostanie zastosowana do {0} obiektów."
 
-#: ../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 "Pusta wartość usunie znacznik."
 
-#: ../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 "<różne>"
 
-#: ../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 "Zmienić wartości?"
 
-#: ../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"
@@ -7651,5 +7670,5 @@
 msgstr[2] "Zmiana właściwości {0} obiektów."
 
-#: ../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."
@@ -7659,77 +7678,77 @@
 msgstr[2] "Zmiana zostanie zastosowana do {0} obiektów."
 
-#: ../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 "Proszę wybierz klucz"
 
-#: ../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 "Proszę wybierz wartość"
 
-#: ../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 "Zaznacz obiekty, których właściwości chcesz zmienić."
 
-#: ../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 "Właściwości/członkostwo"
 
-#: ../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 ""
 
 #. 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 "Członek"
 
-#: ../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 "Właściwości: {0} / członkostwo: {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 "Właściwości / członkostwo"
 
-#: ../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 "Zmień relację"
 
-#: ../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 "Usuń z relacji"
 
-#: ../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 "Na pewno usunąć zaznaczenie z relacji {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 "Usuń wybrany klucz ze wszystkich obiektów."
 
-#: ../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 "Usuń właściwość"
 
-#: ../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 nową parę nazwa/wartość do wszystkich obiektów"
 
-#: ../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 "Edytuj wartość wybranego klucza dla wszystkich obiektów"
 
-#: ../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 ""
@@ -7844,6 +7863,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 ""
 
@@ -7861,6 +7880,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 ""
 
@@ -8015,7 +8034,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 ""
 
@@ -8208,6 +8226,6 @@
 "maxlat): </html>"
 msgstr ""
-"<html><strong>Pobierany obszar</strong> (minlon, minlat, maxlon, maxlat): "
-"</html>"
+"<html><strong>Pobierany obszar</strong> (minlon, minlat, maxlon, maxlat): </"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
@@ -8352,7 +8370,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 ""
 
@@ -8493,6 +8510,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 ""
 
@@ -8502,6 +8519,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 ""
 
@@ -8778,9 +8795,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 ""
 
@@ -8795,8 +8811,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 ""
 
@@ -9042,5 +9057,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 "Nie"
@@ -9048,6 +9063,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 ""
 
@@ -9133,6 +9147,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] ""
@@ -9146,6 +9160,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 "
@@ -9371,5 +9385,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9395,6 +9409,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 ""
 
@@ -9449,6 +9462,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 ""
 
@@ -9502,7 +9515,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 ""
 
@@ -9512,5 +9525,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9526,5 +9539,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..."
@@ -9535,6 +9548,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 ""
 
@@ -9755,7 +9767,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 ""
 
@@ -9781,7 +9793,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 ""
 
@@ -9848,6 +9860,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 ""
 "<html>Wysyłanie nieprzetworzonych danych GPS jako danych mapy jest uznawane "
@@ -9914,6 +9926,6 @@
 "wish<br>to continue?</html>"
 msgstr ""
-"<html>Ta akcja będzie wymagała {0} osobnych pobrań.<br>Czy "
-"kontynuować?</html>"
+"<html>Ta akcja będzie wymagała {0} osobnych pobrań.<br>Czy kontynuować?</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
@@ -10037,6 +10049,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 ""
 
@@ -10100,7 +10112,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 ""
 
@@ -10679,6 +10691,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 ""
 
@@ -10700,8 +10712,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 ""
 
@@ -10821,6 +10833,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 ""
 
@@ -10930,6 +10942,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 ""
 
@@ -11063,8 +11074,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 ""
 
@@ -11147,8 +11158,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 ""
 
@@ -11175,7 +11186,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 ""
 
@@ -11190,6 +11201,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
 msgid "Setting Preference entries directly. Use with caution!"
-msgstr ""
-"Bezpośrednie, ręczne ustawianie preferencji. Należy używać ostrożnie!"
+msgstr "Bezpośrednie, ręczne ustawianie preferencji. Należy używać ostrożnie!"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
@@ -11229,5 +11239,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 "Proszę wybrać wiersz do usunięcia"
@@ -11414,6 +11424,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
-msgstr ""
-"Dokładność pozycji (czerwony = duża, zielony = niska, jeśli dostępne)"
+msgstr "Dokładność pozycji (czerwony = duża, zielony = niska, jeśli dostępne)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
@@ -11587,6 +11596,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 ""
 "Rysuje strzałki kierunkowe korzystając z przygotowanych wartości zamiast "
@@ -11648,6 +11656,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 ""
 
@@ -11719,5 +11726,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 ""
@@ -11737,10 +11744,8 @@
 #: ../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>:"
-msgstr[0] ""
-"Następująca wtyczka została ściągnięta <strong>pomyślnie</strong>:"
+msgstr[0] "Następująca wtyczka została ściągnięta <strong>pomyślnie</strong>:"
 msgstr[1] ""
 "Następujące {0} wtyczki zostały ściągnięte <strong>pomyślnie</strong>:"
@@ -11753,6 +11758,5 @@
 msgid_plural ""
 "Downloading the following {0} plugins has <strong>failed</strong>:"
-msgstr[0] ""
-"Pobieranie następującej wtyczki <strong>nie powiodło się</strong>:"
+msgstr[0] "Pobieranie następującej wtyczki <strong>nie powiodło się</strong>:"
 msgstr[1] ""
 "Pobieranie następujących {0} wtyczek <strong>nie powiodło się</strong>:"
@@ -11871,6 +11875,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 ""
 
@@ -11883,9 +11887,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 ""
 
@@ -12184,6 +12188,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 ""
 
@@ -12194,5 +12198,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 ""
@@ -12202,18 +12206,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 ""
@@ -12222,5 +12226,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 ""
@@ -12229,5 +12233,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 ""
@@ -12236,9 +12240,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 "Sortuj menu szablonów"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
 msgid "Tagging Presets"
 msgstr "Szablony"
@@ -12347,6 +12351,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 ""
 
@@ -12368,6 +12372,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 ""
 
@@ -12446,6 +12450,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 ""
 
@@ -12461,6 +12464,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 ""
 
@@ -12554,6 +12556,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 ""
 
@@ -12687,4 +12689,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 "Zmień właściwości"
@@ -12850,5 +12853,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
@@ -12868,5 +12871,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}''"
@@ -13033,6 +13036,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 ""
 
@@ -13149,10 +13151,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 ""
@@ -13160,69 +13162,69 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
 msgid "Creating changeset..."
 msgstr "Tworzenie zestawu zmian..."
 
-#: ../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 "Pomyślnie otwarto zestaw zmian {0}"
 
-#: ../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 "Oczekiwano ID zestawu zmian > 0. Otrzymano {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349
 msgid "Updating changeset..."
 msgstr "Uaktualnianie zestawu zmian..."
 
-#: ../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 "Uaktualnianie zestawu zmian {0}..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:388
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389
 msgid "Closing changeset..."
 msgstr "Zamykanie zestawu zmian..."
 
-#: ../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 "Przygotowywanie zapytania przesyłania..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447
 msgid "Waiting 10 seconds ... "
 msgstr "Oczekiwanie 10 sekund... "
 
-#: ../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 "Ponowna próba {0} z {1} za {2} sekund..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:458
 msgid "OK - trying again."
 msgstr "OK - próbuję ponownie."
 
-#: ../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 "Ponowna próba {0} z {1}."
 
-#: ../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 "Obecny zestaw zmian jest pusty. Nie można przesłać danych."
 
-#: ../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}."
@@ -13400,4 +13402,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})"
@@ -13417,9 +13420,9 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error "
-"is:<br>{0}</html>"
-msgstr ""
-"<html>Podczas przywracania kopii bezpieczeństwa wystąpił "
-"błąd.<br>Błąd:<br>{0}</html>"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
+"html>"
+msgstr ""
+"<html>Podczas przywracania kopii bezpieczeństwa wystąpił błąd.<br>Błąd:<br>"
+"{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
@@ -13446,6 +13449,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 ""
 
@@ -13487,6 +13490,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 ""
 
@@ -13925,6 +13927,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 ""
 
@@ -14060,6 +14062,6 @@
 "An unexpected exception occurred that may have come from the ''{0}'' plugin."
 msgstr ""
-"Wystąpił niespodziewany błąd, który mógł być spowodowany przez wtyczkę "
-"\"{0}\"."
+"Wystąpił niespodziewany błąd, który mógł być spowodowany przez wtyczkę \"{0}"
+"\"."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
@@ -14138,6 +14140,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 ""
 
@@ -14204,5 +14205,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"
@@ -14285,6 +14286,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 ""
 
@@ -14292,7 +14293,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 ""
 
@@ -14300,7 +14301,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 ""
 
@@ -14308,8 +14309,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 ""
 
@@ -14329,7 +14330,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 ""
 
@@ -14398,7 +14399,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 ""
 
@@ -14410,7 +14410,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 ""
 
@@ -14442,6 +14442,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 ""
 
@@ -14949,6 +14949,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>"
@@ -14975,6 +14975,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"
@@ -15012,6 +15012,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"
@@ -15027,7 +15027,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"
@@ -15078,9 +15078,29 @@
 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 "Ustaw wielkość budynków"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#, fuzzy
+msgid "Rotate crosshair"
+msgstr "Obróć w prawo"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#, fuzzy
+msgid "Advanced settings"
+msgstr "Ustawienia zaawansowane"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#, fuzzy
+msgid "Building tag:"
+msgstr "budynek"
+
+#: ../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"
@@ -15089,35 +15109,45 @@
 #: ../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 "Ustaw wielkość budynków"
 
-#: ../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 "budynek użyteczności publicznej"
+
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
 msgid "Buildings width:"
 msgstr "Szekokość:"
 
-#: ../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
+#, fuzzy
+msgid "Advanced..."
+msgstr "Zaawansowane"
+
+#: ../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 ""
 
@@ -15292,7 +15322,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--waterway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15302,5 +15332,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15310,5 +15340,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15324,5 +15354,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15332,5 +15362,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15338,8 +15368,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 "woda"
@@ -15361,5 +15391,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15368,5 +15398,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15375,5 +15405,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15382,5 +15412,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15389,5 +15419,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15396,10 +15426,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 "adres"
@@ -15428,11 +15458,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 ""
 
@@ -15454,6 +15483,5 @@
 "Replace the original white background by the backgound color defined in JOSM "
 "preferences."
-msgstr ""
-"Zastąp oryginalne białe tło kolorem zdefiniowanym w ustawieniach JOSM."
+msgstr "Zastąp oryginalne białe tło kolorem zdefiniowanym w ustawieniach JOSM."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117
@@ -15859,6 +15887,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 "Pusta warstwa"
@@ -16040,4 +16068,52 @@
 msgid "No GPX data layer found."
 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 "Edycja zoo"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#, fuzzy
+msgid "Name:"
+msgstr "Nazwa"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#, fuzzy
+msgid "CmdLine:"
+msgstr "Współrzędne:"
+
+#: ../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
+#, fuzzy, java-format
+msgid "Delete tool \"{0}\"?"
+msgstr "Usunięto węzeł {0}"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:74
+msgid "Are you sure?"
+msgstr "Czy na pewno?"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
+#, fuzzy
+msgid "New tool..."
+msgstr "Nowa rola"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
+#, fuzzy
+msgid "Install"
+msgstr "teren przemysłowy"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
@@ -16305,5 +16381,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#. 
+#.
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16424,6 +16500,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 ""
 
@@ -16442,7 +16517,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 ""
 
@@ -16751,6 +16825,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 ""
 
@@ -16862,6 +16935,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 ""
 
@@ -16914,6 +16986,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 ""
 
@@ -17277,5 +17348,5 @@
 msgstr "Wycofaj"
 
-#: ../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}"
@@ -17326,4 +17397,41 @@
 msgid "Revert changeset #{0}"
 msgstr ""
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:78
+#, fuzzy
+msgid "Road Sign Plugin"
+msgstr "Ładowanie wtyczek"
+
+#: ../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 "Nie można odczytać źródła szablonów: {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 "Zaznaczenie: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:111
+#, fuzzy, java-format
+msgid "Additional sign {0}"
+msgstr "Dodano relację {0}"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -17430,4 +17538,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 "Uprość drogę"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
+#, fuzzy
+msgid "Delete unnecessary nodes from an area."
+msgstr "Usuwa zbędne węzły z drogi."
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
 msgid "Slippy Map"
@@ -18219,6 +18338,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 ""
 
@@ -18304,8 +18423,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 ""
 
@@ -18359,8 +18478,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 ""
 
@@ -18472,6 +18591,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 ""
 
@@ -18479,6 +18598,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 ""
 
@@ -19131,7 +19250,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 ""
 
@@ -19327,9 +19445,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 "obszar"
@@ -19426,11 +19544,145 @@
 msgstr "{0}, ..."
 
-#: ../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
+#, fuzzy, java-format
+msgid "{0} {1}% of GPS track"
+msgstr "{0} składa się z {1} ścieżki"
+
+#: ../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 "Importuj dźwięk"
+
+#: ../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 "Usuń"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
+#, fuzzy
+msgid "removes current video from layer"
+msgstr "Usuń zdjęcie z warstwy"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
+#, fuzzy
+msgid "play/pause"
+msgstr "Odtwórz / wstrzymaj"
+
+#: ../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 "tło"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
+#, fuzzy
+msgid "jumps n sec back"
+msgstr "Wraca do wcześniej odtwarzanego fragmentu."
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "forward"
+msgstr "Do przodu"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "jumps n sec forward"
+msgstr "Przeskakuje do następnego fragmentu."
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
+#, fuzzy
+msgid "faster"
+msgstr "Szybciej"
+
+#: ../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 "Wolniej"
+
+#: ../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
+msgid "loops n sec around current position"
+msgstr ""
+
+#. 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
+#, fuzzy
+msgid "Jump length"
+msgstr "Przejdź"
+
+#: ../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
+#, fuzzy
+msgid "Loop length"
+msgstr "Długość: "
+
+#: ../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 "warstwa"
+
+#: ../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 ""
 
@@ -19645,28 +19897,28 @@
 "Może to spowodować powstanie błędnych współrzędnych."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
 msgid "Automatic downloading"
 msgstr "Automatyczne pobieranie"
 
-#: ../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 "Warstwa WMS ({0}), automatycznie pobrana w powiększeniu {1}"
 
-#: ../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 "Warstwa WMS ({0}), pobrana w powiększeniu {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
 #, java-format
 msgid ""
@@ -19677,113 +19929,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 "Pobierz widoczne kafle"
 
-#: ../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 "Zmień rozdzielczość"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341
 msgid "Reload erroneous tiles"
 msgstr "Wczytaj ponownie błędne kafle"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365
 msgid "Alpha channel"
 msgstr "Kanał alfa"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385
 msgid "Save WMS layer to file"
 msgstr "Zapisz warstwę WMS do pliku"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
 msgid "Save WMS layer"
 msgstr "Zapisz plik"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413
 msgid "Load WMS layer from file"
 msgstr "Otwórz warstwę WMS z pliku"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
 msgid "Load WMS layer"
 msgstr "Otwórz warstwę WMS"
 
-#: ../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 "Nieosługiwana wersja pliku WMS; znaleziono {0}, oczekiwano {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
 msgid "File Format Error"
 msgstr "Błędny format pliku"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449
 msgid "Error loading file"
 msgstr "Błąd podczas ładowania pliku"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463
 msgid "Set WMS Bookmark"
 msgstr "Ustaw zakładkę WMS"
 
-#: ../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 "Tworzy pustą warstwę WMS do załadowania danych z pliku"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
 msgid "WMS Plugin Preferences"
 msgstr "Ustawienia wtyczki WMS"
 
-#: ../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 "Zmodyfikuj listę serwerów WMS wyświetlanych w menu wtyczki WMS"
 
-#: ../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 "Nazwa w menu"
 
-#: ../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 "Adres serwera WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "Menu Name (Default)"
 msgstr "Nazwa w menu (domyślna)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "WMS URL (Default)"
 msgstr "URL WMS (domyślny)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:86
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
 msgid "Enter a menu name and WMS URL"
 msgstr "Wpisz nazwę pozycji w menu oraz adres serwera WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:111
 msgid "Copy Selected Default(s)"
 msgstr "Kopiuj zaznaczony serwer do menu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
 msgid "Please select at least one row to copy."
 msgstr "Wybierz co najmniej jeden wiersz do skopiowania."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
 msgid "Downloader:"
 msgstr ""
@@ -19799,4 +20051,8 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
 msgid "% of north:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186
+msgid "Simultaneous connections"
 msgstr ""
 
@@ -19809,7 +20065,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
@@ -19857,8 +20113,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 "las"
@@ -19875,7 +20131,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--boundary tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -19885,5 +20141,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -19926,5 +20182,5 @@
 #. color boundary
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -19934,5 +20190,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -19942,5 +20198,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -19950,15 +20206,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 "granica"
@@ -19974,5 +20230,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -19981,7 +20237,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--route tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -19991,5 +20247,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -19999,5 +20255,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -20007,5 +20263,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -20015,5 +20271,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -20023,5 +20279,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -20031,5 +20287,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -20039,12 +20295,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 "droga"
@@ -20321,21 +20577,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 "
@@ -20345,10 +20600,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."
@@ -20356,5 +20611,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 "
@@ -20364,15 +20619,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 "
@@ -20381,5 +20636,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 "
@@ -20389,15 +20644,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"
@@ -20405,5 +20660,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."
@@ -20411,5 +20666,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 "
@@ -20418,5 +20673,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 "
@@ -20425,10 +20680,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."
@@ -20436,15 +20691,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 "
@@ -20453,10 +20709,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 "
@@ -20465,15 +20728,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 "
@@ -20483,10 +20746,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). "
@@ -20495,5 +20758,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) "
@@ -20502,5 +20765,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:89
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20509,10 +20772,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 "
@@ -20521,5 +20784,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 "
@@ -20529,5 +20792,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:97
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20538,15 +20801,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 "
@@ -20555,5 +20818,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:105
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21443,10 +21706,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 "rondo"
@@ -21583,8 +21846,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"/>
@@ -21794,5 +22057,5 @@
 #. color motorroad
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21802,5 +22065,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21819,5 +22082,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21827,5 +22090,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21844,5 +22107,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -21852,5 +22115,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -21869,5 +22132,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -21877,5 +22140,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -21890,5 +22153,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -21906,8 +22169,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 "droga lokalna"
@@ -21922,5 +22185,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -21929,5 +22192,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--public_transport tags -->
 #. <rule>
@@ -21937,10 +22200,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 "droga serwisowa"
@@ -21955,5 +22218,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -21962,5 +22225,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -21970,10 +22233,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 "w budowie"
@@ -22979,9 +23242,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 "marsze"
@@ -23311,5 +23574,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -23319,5 +23582,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -23327,5 +23590,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -23335,5 +23598,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -23343,5 +23606,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -23351,5 +23614,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -23359,5 +23622,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -23368,5 +23631,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -23374,9 +23637,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 "kolej"
@@ -24786,5 +25049,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24794,5 +25057,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24802,5 +25065,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24810,5 +25073,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -25172,7 +25435,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--sport tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -25182,5 +25445,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -25190,5 +25453,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -25198,5 +25461,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -25206,5 +25469,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -25214,5 +25477,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -25222,5 +25485,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -25230,5 +25493,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -25238,5 +25501,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -25246,5 +25509,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -25254,5 +25517,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -25262,5 +25525,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -25270,5 +25533,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -25278,5 +25541,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -25286,5 +25549,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -25294,5 +25557,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -25302,5 +25565,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -25310,5 +25573,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -25318,5 +25581,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -25326,5 +25589,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -25334,5 +25597,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -25342,5 +25605,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -25350,5 +25613,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -25358,5 +25621,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -25366,5 +25629,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -25374,5 +25637,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -25382,5 +25645,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -25390,5 +25653,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -25398,5 +25661,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -25406,5 +25669,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -25414,5 +25677,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -25422,5 +25685,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -25430,5 +25693,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -25438,5 +25701,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -25446,5 +25709,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -25454,5 +25717,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -25462,5 +25725,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -25470,5 +25733,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -25478,5 +25741,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -25486,5 +25749,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -25494,5 +25757,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -25502,5 +25765,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -25510,5 +25773,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -25518,5 +25781,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -25526,5 +25789,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -25534,5 +25797,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -25542,33 +25805,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 "Sport"
@@ -27246,7 +27509,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--landuse tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -27256,5 +27519,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -27264,5 +27527,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -27272,5 +27535,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -27280,5 +27543,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -27288,5 +27551,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -27296,5 +27559,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -27304,5 +27567,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -27312,12 +27575,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 "zielony"
@@ -28733,5 +28996,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -28747,5 +29010,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28755,18 +29018,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 -->
@@ -28775,7 +29055,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- cycleway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28785,5 +29065,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28793,5 +29073,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28801,5 +29081,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28809,12 +29089,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 ""
@@ -28841,5 +29122,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -28855,5 +29136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -28863,5 +29144,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28870,13 +29151,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"/>
@@ -28887,11 +29176,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 ""
@@ -28910,8 +29200,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 "metro"
@@ -29023,9 +29313,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
@@ -29033,5 +29323,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,
@@ -29041,8 +29331,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
@@ -29056,5 +29346,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#. 
+#.
 #: build/trans_style.java:72
 msgid "standard"
@@ -29062,5 +29352,5 @@
 
 #. mappaint style named "standard"
-#. 
+#.
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -29109,6 +29399,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>
@@ -29188,5 +29478,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -29196,16 +29486,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 "przestarzały"
@@ -29216,5 +29506,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -29223,5 +29513,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -29230,5 +29520,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -29244,5 +29534,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -29256,5 +29546,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -29263,5 +29553,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -29270,5 +29560,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -29277,5 +29567,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -29284,5 +29574,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -29291,5 +29581,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -29298,5 +29588,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxweight"/>
@@ -29305,5 +29595,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxheight"/>
@@ -29312,5 +29602,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -29319,5 +29609,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxlength"/>
@@ -29326,5 +29616,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -29333,5 +29623,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="minspeed"/>
@@ -29340,5 +29630,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxstay"/>
@@ -29347,5 +29637,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="toll"/>
@@ -29354,5 +29644,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="barrier"/>
@@ -29529,7 +29819,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- highway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -29543,5 +29833,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -29551,7 +29841,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- tracktype tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -29561,5 +29851,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -29569,5 +29859,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -29577,5 +29867,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -29585,10 +29875,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 ""
@@ -29599,5 +29889,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -29606,5 +29896,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -29614,5 +29904,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -29621,5 +29911,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -29628,5 +29918,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -29635,5 +29925,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -29642,5 +29932,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -29649,5 +29939,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -29656,5 +29946,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -29663,5 +29953,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -29670,5 +29960,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -29677,8 +29967,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 "serwis"
@@ -29689,8 +29979,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 ""
@@ -29701,5 +29991,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -29708,8 +29998,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 ""
@@ -29720,9 +30010,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 ""
@@ -29733,9 +30023,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 "koryto rzeczne"
@@ -29746,8 +30036,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 "strumień"
@@ -29758,8 +30048,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 "Dok"
@@ -29770,5 +30060,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29777,5 +30067,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29784,5 +30074,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29792,5 +30082,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29799,5 +30089,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29806,5 +30096,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29813,5 +30103,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29821,5 +30111,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29830,5 +30120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -29838,7 +30128,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--man_made tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -29848,5 +30138,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -29856,5 +30146,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -29864,5 +30154,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -29873,5 +30163,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -29880,5 +30170,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -29888,5 +30178,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -29896,5 +30186,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -29904,5 +30194,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -29912,5 +30202,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -29920,5 +30210,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -29928,5 +30218,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -29936,5 +30226,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -29944,5 +30234,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -29952,18 +30242,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 ""
@@ -29973,9 +30263,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 ""
@@ -29986,7 +30276,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- railway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -29996,5 +30286,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -30003,5 +30293,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -30011,5 +30301,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -30018,5 +30308,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -30026,5 +30316,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -30034,10 +30324,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 ""
@@ -30048,5 +30338,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -30057,13 +30347,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 ""
@@ -30074,5 +30364,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -30082,5 +30372,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30093,5 +30383,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30099,7 +30389,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 "stare szyny kolejowe"
@@ -30110,5 +30400,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -30117,5 +30407,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -30124,5 +30414,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -30131,7 +30421,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aeroway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -30142,9 +30432,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 ""
@@ -30155,8 +30445,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 "Terminal"
@@ -30167,5 +30457,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -30175,8 +30465,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 ""
@@ -30187,8 +30477,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 ""
@@ -30199,5 +30489,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -30206,5 +30496,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -30213,7 +30503,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aerialway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -30223,5 +30513,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -30231,5 +30521,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -30239,5 +30529,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -30247,5 +30537,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -30255,10 +30545,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 "droga powietrzna"
@@ -30269,11 +30559,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 ""
@@ -30284,9 +30574,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 ""
@@ -30297,9 +30587,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 ""
@@ -30310,9 +30600,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 ""
@@ -30323,9 +30613,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 ""
@@ -30336,9 +30626,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 ""
@@ -30349,7 +30639,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--power tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -30359,5 +30649,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -30366,5 +30656,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -30374,5 +30664,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -30382,5 +30672,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -30390,5 +30680,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -30398,5 +30688,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -30406,5 +30696,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -30414,5 +30704,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -30422,5 +30712,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -30430,5 +30720,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -30438,5 +30728,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -30446,5 +30736,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -30454,15 +30744,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 "energia"
@@ -30472,9 +30762,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 "nabrzeże"
@@ -30485,8 +30775,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 ""
@@ -30496,7 +30786,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--leisure tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -30506,5 +30796,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -30514,5 +30804,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -30522,5 +30812,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -30530,5 +30820,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -30538,5 +30828,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -30546,5 +30836,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -30554,5 +30844,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -30562,5 +30852,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -30570,5 +30860,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -30578,5 +30868,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -30586,5 +30876,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -30594,5 +30884,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -30602,5 +30892,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -30610,5 +30900,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -30618,5 +30908,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -30626,17 +30916,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 "wypoczynek"
@@ -30646,9 +30936,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 "marina"
@@ -30658,7 +30948,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--amenity tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -30668,5 +30958,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -30676,5 +30966,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -30684,5 +30974,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -30692,5 +30982,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -30700,5 +30990,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -30708,5 +30998,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -30716,5 +31006,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -30724,5 +31014,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -30732,5 +31022,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -30740,14 +31030,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 "udogodnienie"
@@ -30757,5 +31047,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30765,5 +31055,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30773,5 +31063,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30781,5 +31071,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30789,5 +31079,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30797,5 +31087,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30805,5 +31095,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30813,5 +31103,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30821,5 +31111,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30829,5 +31119,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -30837,5 +31127,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -30845,14 +31135,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 ""
@@ -30862,5 +31152,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -30869,5 +31159,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -30877,5 +31167,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -30884,5 +31174,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -30892,5 +31182,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -30900,5 +31190,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -30908,5 +31198,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -30915,5 +31205,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -30923,5 +31213,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -30931,5 +31221,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -30939,5 +31229,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -30947,5 +31237,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -30954,5 +31244,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -30961,5 +31251,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -30968,5 +31258,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -30975,5 +31265,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -30982,5 +31272,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -30989,5 +31279,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -30996,5 +31286,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -31003,5 +31293,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -31010,5 +31300,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -31017,5 +31307,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -31024,5 +31314,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -31031,5 +31321,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -31038,5 +31328,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -31046,5 +31336,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -31054,5 +31344,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -31062,5 +31352,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -31070,5 +31360,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -31078,5 +31368,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -31086,5 +31376,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -31094,5 +31384,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -31102,5 +31392,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -31110,5 +31400,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -31119,5 +31409,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -31127,5 +31417,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -31135,5 +31425,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -31143,5 +31433,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -31151,5 +31441,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -31159,5 +31449,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -31167,5 +31457,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -31175,5 +31465,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -31183,5 +31473,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -31191,5 +31481,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -31199,5 +31489,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -31207,5 +31497,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -31215,5 +31505,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -31223,5 +31513,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -31231,5 +31521,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -31239,5 +31529,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"/>
@@ -31247,5 +31545,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -31255,5 +31553,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -31263,5 +31561,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -31271,5 +31569,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -31278,27 +31576,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 ""
@@ -31308,5 +31607,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -31316,5 +31615,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -31324,12 +31623,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 ""
@@ -31339,5 +31638,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -31347,5 +31646,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -31355,5 +31654,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -31363,5 +31662,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -31371,5 +31670,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -31379,5 +31678,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -31387,11 +31686,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 "zdrowie"
@@ -31401,7 +31700,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--shop tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -31411,5 +31710,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -31419,5 +31718,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -31427,5 +31726,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -31435,5 +31734,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -31443,5 +31742,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -31451,5 +31750,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -31459,5 +31758,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -31467,5 +31766,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -31475,5 +31774,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -31483,5 +31782,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -31491,5 +31790,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -31499,5 +31798,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -31507,5 +31806,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -31515,5 +31814,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -31523,5 +31822,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -31531,5 +31830,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -31539,5 +31838,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -31547,5 +31846,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -31555,5 +31854,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -31563,5 +31862,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -31571,5 +31870,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -31579,5 +31878,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -31587,5 +31886,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -31595,5 +31894,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -31603,5 +31902,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -31611,5 +31910,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -31619,5 +31918,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -31627,5 +31926,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -31635,5 +31934,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -31643,5 +31942,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -31651,5 +31950,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -31659,5 +31958,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -31667,5 +31966,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -31675,5 +31974,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -31683,5 +31982,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -31691,5 +31990,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -31699,5 +31998,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -31707,5 +32006,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -31715,5 +32014,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -31723,5 +32022,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -31731,5 +32030,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -31739,31 +32038,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 "sklep"
@@ -31773,7 +32072,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--tourism tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31783,5 +32082,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31791,5 +32090,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31799,5 +32098,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31807,5 +32106,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31815,5 +32114,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31823,5 +32122,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31831,12 +32130,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 "hotel"
@@ -31846,5 +32145,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -31854,5 +32153,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -31862,5 +32161,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -31870,5 +32169,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -31878,5 +32177,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -31886,5 +32185,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -31895,5 +32194,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -31903,5 +32202,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- information tags -->
 #. <rule>
@@ -31911,5 +32210,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -31919,5 +32218,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -31926,5 +32225,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -31933,13 +32232,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 "turystyka"
@@ -31949,7 +32248,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--historic tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -31959,5 +32258,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -31967,5 +32266,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -31975,5 +32274,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -31983,5 +32282,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -31991,5 +32290,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -31999,5 +32298,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -32007,5 +32306,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -32015,5 +32314,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -32023,13 +32322,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 "historia"
@@ -32039,8 +32338,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 "kamieniołom"
@@ -32051,8 +32350,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 "Wysypisko smieci"
@@ -32063,5 +32362,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -32071,8 +32370,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 "Basen"
@@ -32083,8 +32382,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 "Gospodarstwo"
@@ -32095,6 +32394,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
-#. 
+#.
+#.
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -32104,8 +32403,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 ""
@@ -32116,8 +32415,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 "Teren przemysłowy"
@@ -32128,8 +32427,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 "teren poprzemysłowy"
@@ -32140,8 +32439,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 ""
@@ -32152,8 +32451,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 "Teren kolejowy"
@@ -32164,5 +32463,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -32172,7 +32471,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--military tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -32182,5 +32481,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -32190,5 +32489,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -32198,5 +32497,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -32206,11 +32505,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 "Teren wojskowy"
@@ -32221,8 +32520,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 "cmentarz"
@@ -32232,8 +32531,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 "szczyt"
@@ -32244,9 +32543,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 "lodowiec"
@@ -32256,9 +32555,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 "wulkan"
@@ -32268,5 +32567,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -32277,5 +32576,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -32285,5 +32584,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -32293,5 +32592,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -32301,5 +32600,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -32309,12 +32608,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 ""
@@ -32324,9 +32623,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 ""
@@ -32336,9 +32635,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 "zdrowie"
@@ -32348,9 +32647,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 ""
@@ -32360,9 +32659,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 "błoto"
@@ -32372,9 +32671,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 "plaża"
@@ -32385,5 +32684,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?
@@ -32409,5 +32708,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -32418,11 +32717,11 @@
 #. </rule>
 #. -->
-#. 
+#.
 #. <!--name tags -->
-#. 
+#.
 #. <!--preferences tags -->
-#. 
+#.
 #. <!--place tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -32432,5 +32731,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -32440,5 +32739,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -32448,5 +32747,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -32456,5 +32755,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -32464,5 +32763,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -32472,5 +32771,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -32480,5 +32779,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -32488,5 +32787,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -32496,5 +32795,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -32504,5 +32803,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -32512,5 +32811,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -32520,15 +32819,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 "Miejsce"
@@ -32538,9 +32837,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 ""
@@ -32631,5 +32930,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#. 
+#.
 #. Data type can be:
 #. node        - a node point
@@ -32637,28 +32936,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
@@ -32773,5 +33072,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#. 
+#.
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32784,5 +33083,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>
@@ -32807,6 +33106,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#. 
-#. 
+#.
+#.
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32815,6 +33114,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#. 
-#. 
+#.
+#.
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32829,6 +33128,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
@@ -32842,6 +33141,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
@@ -32861,6 +33160,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#. 
-#. 
+#.
+#.
 #. only for Japan
 #: build/trans_wms.java:39
@@ -32884,6 +33183,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
@@ -32911,5 +33210,4 @@
 #~ msgstr "Załaduj zaznaczenie"
 
-#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "Kontakt {0}..."
@@ -33002,9 +33300,7 @@
 #~ msgstr "Pobierz brakujące wtyczki"
 
-#, java-format
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "Używa szablon \"{0}\" z grupy \"{1}\""
 
-#, java-format
 #~ msgid "Use preset ''{0}''"
 #~ msgstr "Używa szablon \"{0}\""
@@ -33013,5 +33309,4 @@
 #~ msgstr "EPSG:4326"
 
-#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Nie znaleziono wtyczki: {0}."
@@ -33089,5 +33384,4 @@
 #~ msgstr "Nie zaimportowano danych."
 
-#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Błąd w czasie ładowania strony {0}"
@@ -33105,5 +33399,4 @@
 #~ msgstr "Sprzeczne relacje"
 
-#, java-format
 #~ msgid "rectifier id={0}"
 #~ msgstr "rectifier id={0}"
@@ -33122,6 +33415,6 @@
 #~ "about the problem."
 #~ msgstr ""
-#~ "Wtyczka nie może zostać usunięta. Proszę przekaż informacje o tym problemie "
-#~ "autorom JOSM."
+#~ "Wtyczka nie może zostać usunięta. Proszę przekaż informacje o tym "
+#~ "problemie autorom JOSM."
 
 #~ msgid "Error during parse."
@@ -33134,5 +33427,4 @@
 #~ msgstr "Wprowadź hasło"
 
-#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "Plugin wymaga aktualizacji JOSM: {0}."
@@ -33141,5 +33433,4 @@
 #~ msgstr "<nd> nie posiada referencji"
 
-#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Proszę zgłosić bład pod adresem {0}"
@@ -33152,6 +33443,6 @@
 
 #~ 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 ""
 #~ "Postaraj się zaintalować najnowszą wersję tej wtyczki przed zgłaszaniem "
@@ -33161,5 +33452,4 @@
 #~ msgstr "Znaleziono tag <member> w"
 
-#, java-format
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "Nie można odczytać \"{0}\""
@@ -33170,6 +33460,6 @@
 #~ msgid "Include your steps to get to the error (as detailed as possible)!"
 #~ msgstr ""
-#~ "Dołącz instrukcje (dokładne i krok po kroku) w jaki sposób można odtworzyć "
-#~ "błędną sytuację."
+#~ "Dołącz instrukcje (dokładne i krok po kroku) w jaki sposób można "
+#~ "odtworzyć błędną sytuację."
 
 #~ msgid "Be sure to include the following information:"
@@ -33180,6 +33470,6 @@
 #~ "some time."
 #~ msgstr ""
-#~ "Serwer zgłosił błąd wewnętrzny. Spróbuj zmniejszyć obszar lub spróbować po "
-#~ "chwili."
+#~ "Serwer zgłosił błąd wewnętrzny. Spróbuj zmniejszyć obszar lub spróbować "
+#~ "po chwili."
 
 #~ msgid "Ill-formed node id"
@@ -33202,5 +33492,4 @@
 #~ msgstr "Wystąpiły konfikty podczas importowania."
 
-#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -33211,24 +33500,20 @@
 #~ " {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 ""
 #~ "Wtyczka {0} wydaje siębyć zepsuta lub nie można było jej pobrać "
 #~ "automatycznie."
 
-#, java-format
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Nie można pobrać wtyczki {0} z {1}"
 
-#, java-format
 #~ msgid "Error: {0}"
 #~ msgstr "Błąd: {0}"
 
-#, java-format
 #~ msgid "Warning: {0}"
 #~ msgstr "Uwaga: {0}"
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -33260,9 +33545,7 @@
 #~ "Wskazówka: Niektóre zmiany powstały z powodu wysłania danych na serwer."
 
-#, java-format
 #~ msgid "Unknown role ''{0}''."
 #~ msgstr "Nieznana rola \"{0}\"."
 
-#, java-format
 #~ msgid "Parsing error in URL: \"{0}\""
 #~ msgstr "Błąd przetwarzania adresu URL: \"{0}\""
@@ -33277,17 +33560,13 @@
 #~ msgstr "Plik nie został odnaleziony"
 
-#, java-format
 #~ msgid "The date in file \"{0}\" could not be parsed."
 #~ msgstr "Data zawarta w pliku \"{0}\" nie mogła zostać przetworzona."
 
-#, java-format
 #~ msgid "Layers: {0}"
 #~ msgstr "Warstwy: {0}"
 
-#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "Autorzy: {0}"
 
-#, java-format
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr ""
@@ -33297,5 +33576,4 @@
 #~ msgstr "Wtyczka już istnieje"
 
-#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -33304,12 +33582,12 @@
 #~ "{0}"
 #~ msgstr ""
-#~ "Archiwum z wtyczką już istnieje. Czy na pewno pobrać aktualną wersję kasując "
-#~ "istniejące archiwum?\n"
+#~ "Archiwum z wtyczką już istnieje. Czy na pewno pobrać aktualną wersję "
+#~ "kasując istniejące archiwum?\n"
 #~ "\n"
 #~ "{0}"
 
 #~ 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 ""
 #~ "Aktywacja zaktualizowanych wtyczek nie powiodła się. Sprawdź czy JOSM ma "
@@ -33327,6 +33605,6 @@
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still want "
-#~ "to merge them?"
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
 #~ msgstr ""
 #~ "Wybrane węzły są częścią różnych relacji. Czy nadal chcesz je scalić."
@@ -33355,13 +33633,10 @@
 #~ msgstr "Ustaw język"
 
-#, java-format
 #~ msgid "GPS start: {0}"
 #~ msgstr "GPS początek: {0}"
 
-#, java-format
 #~ msgid "GPS end: {0}"
 #~ msgstr "GPS koniec: {0}"
 
-#, java-format
 #~ msgid "current delta: {0}s"
 #~ msgstr "aktualne przesunięcie: {0}s"
@@ -33395,7 +33670,4 @@
 #~ msgstr "Weryfikuje bieżące zaznaczenie lub całość danych."
 
-#~ msgid "Are you sure?"
-#~ msgstr "Czy na pewno?"
-
 #~ msgid "Open User Page"
 #~ msgstr "Otwórz stronę użytkownika"
@@ -33407,5 +33679,4 @@
 #~ msgstr "brona"
 
-#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Historia poleceń: {0}"
@@ -33436,9 +33707,7 @@
 #~ msgstr "Usuń zaznaczone"
 
-#, java-format
 #~ msgid "No time for point {0} x {1}"
 #~ msgstr "Brak znacznika czasowego dla punktu {0} x {1}"
 
-#, java-format
 #~ msgid "Images for {0}"
 #~ msgstr "Obrazy dla {0}"
@@ -33474,5 +33743,4 @@
 #~ msgstr "Kliknij \"Odśwież\" by zaktualizować listę"
 
-#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Edytor relacji: {0}"
@@ -33484,5 +33752,4 @@
 #~ msgstr "Przesuń w dół"
 
-#, java-format
 #~ msgid "There is no EXIF time within the file \"{0}\"."
 #~ msgstr "Plik {0} nie zawiera żadnych danych EXIF o czasie."
@@ -33491,5 +33758,4 @@
 #~ msgstr "Źródło szablonów"
 
-#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} wewnątrz ścieżki GPS."
@@ -33499,11 +33765,10 @@
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version selected "
-#~ "in the history list."
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
 #~ msgstr ""
-#~ "Cofnij stan aktualnie zaznaczonych obiektów do wersji zaznaczonej w liście "
-#~ "historia poleceń."
-
-#, java-format
+#~ "Cofnij stan aktualnie zaznaczonych obiektów do wersji zaznaczonej w "
+#~ "liście historia poleceń."
+
 #~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
 #~ msgstr "Nie można odczytać czasu \"{0}\" w punkcie {1} x {2}"
@@ -33549,6 +33814,6 @@
 
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want to "
-#~ "combine them?"
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
 #~ msgstr ""
 #~ "Wybrane drogi należą do różnych relacji. Czy nadal chcesz je połączyć?"
@@ -33570,5 +33835,4 @@
 #~ msgstr "Błędy podczas pobierania"
 
-#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -33587,5 +33851,6 @@
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data layer?"
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
 #~ msgstr ""
 #~ "Nie znaleziono danych do aktualizacji. Czy została pobrana lub otwarta "
@@ -33593,11 +33858,10 @@
 
 #~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this as "
-#~ "a bug."
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
 #~ msgstr ""
 #~ "Błąd wewnętrzny: proszę zgłosić błąd dla komunikatu: \"cannot check "
 #~ "conditions for no layer\"."
 
-#, java-format
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
@@ -33608,5 +33872,4 @@
 #~ msgstr "Nieprawidłowe odwzorowanie"
 
-#, java-format
 #~ msgid ""
 #~ "Current number of changes exceeds the max. number of changes, current is "
@@ -33635,13 +33898,12 @@
 
 #~ msgid ""
-#~ "You are about to delete nodes outside of the area you have "
-#~ "downloaded.<br>This can cause problems because other objects (that you don't "
-#~ "see) might use them.<br>Do you really want to delete?"
+#~ "You are about to delete nodes outside of the area you have downloaded."
+#~ "<br>This can cause problems because other objects (that you don't see) "
+#~ "might use them.<br>Do you really want to delete?"
 #~ msgstr ""
-#~ "Zamierzasz usunąć węzły spoza obszaru, który pobrano.<br>Może to spowodowac "
-#~ "problem, ponieważ inne (niewidoczne dla ciebie) obiekty mogą używać tych "
-#~ "węzłów.<br>Czy naprawdę zamierzasz je usunąć?"
-
-#, java-format
+#~ "Zamierzasz usunąć węzły spoza obszaru, który pobrano.<br>Może to "
+#~ "spowodowac problem, ponieważ inne (niewidoczne dla ciebie) obiekty mogą "
+#~ "używać tych węzłów.<br>Czy naprawdę zamierzasz je usunąć?"
+
 #~ msgid ""
 #~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
@@ -33658,16 +33920,14 @@
 #~ msgstr "Zawsze przesuwaj i nie pokazuj tego okna dialogowego"
 
-#, java-format
 #~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr ""
 #~ "Brak strony pomocy. Utwórz ją w języku <A HREF=\"{0}\">angielskim</A>."
 
-#, java-format
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
 #~ msgstr ""
-#~ "Brak strony pomocy. Utwórz ją w języku <A HREF=\"{0}\">angielskim</A> lub <A "
-#~ "HREF=\"{1}\">swoim języku</A>."
+#~ "Brak strony pomocy. Utwórz ją w języku <A HREF=\"{0}\">angielskim</A> lub "
+#~ "<A HREF=\"{1}\">swoim języku</A>."
 
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
@@ -33676,19 +33936,16 @@
 
 #~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
 #~ msgstr ""
-#~ "Brak strony pomocy. Możesz ją utworzyć po <a href=\"{0}\">angielsku</a> lub "
-#~ "<A HREF=\"{1}\">po polsku</A>."
-
-#, java-format
+#~ "Brak strony pomocy. Możesz ją utworzyć po <a href=\"{0}\">angielsku</a> "
+#~ "lub <A HREF=\"{1}\">po polsku</A>."
+
 #~ msgid "Parameter ''{0}'' must not be null."
 #~ msgstr "parameter ''{0}'' nie może być pusty (null)"
 
-#, java-format
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "niespodziewana wartość powrotna. Dostałem {0}"
 
-#, java-format
 #~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 #~ msgstr "Oczekiwałem warstwy danych OSM, bądź GPX. Otrzymałem \"{0}\"."
@@ -33703,5 +33960,4 @@
 #~ msgstr "usunięte, bądź przesunięte elementy"
 
-#, java-format
 #~ msgid ""
 #~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
Index: /applications/editors/josm/i18n/po/pt_BR.po
===================================================================
--- /applications/editors/josm/i18n/po/pt_BR.po	(revision 21970)
+++ /applications/editors/josm/i18n/po/pt_BR.po	(revision 21971)
@@ -8,7 +8,7 @@
 "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-13 03:29+0000\n"
-"Last-Translator: Skippern <Unknown>\n"
+"POT-Creation-Date: 2010-06-23 22:47+0200\n"
+"PO-Revision-Date: 2010-06-21 20:13+0000\n"
+"Last-Translator: Rodrigo de Avila <rodrigo@avila.net.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2010-06-15 16:23+0000\n"
+"X-Launchpad-Export-Date: 2010-06-23 20:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -23,5 +23,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
@@ -93,5 +93,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
@@ -208,6 +208,6 @@
 msgstr ""
 "Aviso: formato inesperado da URL base da API. Redireccionar para a página do "
-"usuário para o seu OSM vai, provavelmente, falhar. A URL base da API é: "
-"\"{0}\""
+"usuário para o seu OSM vai, provavelmente, falhar. A URL base da API é: \"{0}"
+"\""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86
@@ -256,5 +256,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
@@ -277,5 +277,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
@@ -283,6 +283,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
@@ -291,4 +293,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
@@ -326,9 +330,9 @@
 #, java-format
 msgid ""
-"<html>There are no layers the source layer<br>''{0}''<br>could be merged "
-"to.</html>"
-msgstr ""
-"<html>Não há camadas em que a camada<br>''{0}''<br>possa ser "
-"combinada.</html>"
+"<html>There are no layers the source layer<br>''{0}''<br>could be merged to."
+"</html>"
+msgstr ""
+"<html>Não há camadas em que a camada<br>''{0}''<br>possa ser combinada.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:81
@@ -351,9 +355,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
@@ -413,4 +417,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
@@ -450,5 +455,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 "Informações"
@@ -662,5 +667,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
@@ -675,5 +680,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 "Excluir"
@@ -900,6 +905,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr ""
-"Mostrar informações de objeto sobre nós, caminhos ou relações do OSM."
+msgstr "Mostrar informações de objeto sobre nós, caminhos ou relações do OSM."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:114
@@ -926,13 +930,14 @@
 #: ../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 ""
 "The selected ways have nodes outside of the downloaded data region."
 msgstr[0] "O caminho selecionado tem nós fora da área de download definida."
-msgstr[1] ""
-"Os caminhos selecionados têm nós fora da área de download definida."
+msgstr[1] "Os caminhos selecionados têm nós fora da área de download definida."
 
 #: ../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 "Isto pode levar a nós apagados acidentalmente."
@@ -1076,6 +1081,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
-msgstr ""
-"Impossível analisar Latitude, Longitude ou Zoom. Por favor, verificar."
+msgstr "Impossível analisar Latitude, Longitude ou Zoom. Por favor, verificar."
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116
@@ -1514,6 +1518,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
@@ -1540,4 +1544,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
@@ -1546,6 +1552,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 "Erro"
@@ -1661,6 +1667,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 ""
 "Mostrar relatório atual com informações úteis que podem ser anexadas aos bugs"
@@ -1697,8 +1702,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 "Sim, remova os nós"
 
 #: ../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 "Apagar nós fora da região de dados baixada"
@@ -1707,5 +1714,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 "Não, abortar"
@@ -1713,16 +1721,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 "Cancelar operação"
 
 #: ../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 "Você deseja removê-los de qualquer forma?"
 
 #: ../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 "Deletar nós fora da região de dados?"
 
 #: ../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 "Por favor, selecione ao menos um caminho para simplificar."
@@ -1731,13 +1744,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 "Sim"
 
 #: ../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 "Simplifque todos os caminhos selecionados"
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:126
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:89
 #, java-format
 msgid ""
@@ -1746,8 +1762,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 "Simplificar caminhos?"
 
 #: ../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"
@@ -1757,4 +1775,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)"
@@ -1833,6 +1852,6 @@
 "this and correct it when necessary.</html>"
 msgstr ""
-"<html>Uma composição de relação foi copiada para todos os caminhos "
-"novos.<br>Deverá verificar isto e corrigir quando necessário.</html>"
+"<html>Uma composição de relação foi copiada para todos os caminhos novos."
+"<br>Deverá verificar isto e corrigir quando necessário.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
@@ -1893,6 +1912,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 "* Um nó que é usado em mais de um caminho e um destes caminhos, ou"
 
@@ -1965,9 +1983,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)"
@@ -1984,5 +2002,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
@@ -2052,5 +2070,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 "Não há modificações a enviar."
@@ -2069,14 +2086,14 @@
 "Enviar todas as alterações presentes na seleção atual para o servidor OSM."
 
-#: ../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 "Verificando pais para os o objetos apagados"
 
-#: ../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 "Lendo os pais de \"{0}\""
 
-#: ../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 "Buscando pais apagados no grupo de dados local"
@@ -2289,6 +2306,5 @@
 #, java-format
 msgid "The following errors occurred during mass download: {0}"
-msgstr ""
-"Os erros a seguir ocorreram durante a obtenção de dados em massa: {0}"
+msgstr "Os erros a seguir ocorreram durante a obtenção de dados em massa: {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245
@@ -2329,5 +2345,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
 msgid "Error during download"
-msgstr ""
+msgstr "Erro durante o download"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
@@ -2344,5 +2360,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
@@ -2462,6 +2478,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 ""
 "Arraste a símbolo de reprodução e solte próximo à trilha para reproduzir "
@@ -2600,5 +2616,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."
@@ -2635,5 +2651,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "all objects"
-msgstr ""
+msgstr "Todos os Objetos"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161
@@ -2647,6 +2663,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
-msgstr ""
-"<b>Rua Augusta</b> - \"Rua\" e \"Augusta\" em qualquer chave ou valor."
+msgstr "<b>Rua Augusta</b> - \"Rua\" e \"Augusta\" em qualquer chave ou valor."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
@@ -2667,6 +2682,6 @@
 "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
 msgstr ""
-"<b>type=*</b> - chave ''type'' com qualquer valor. Tente também  "
-"<b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
+"<b>type=*</b> - chave ''type'' com qualquer valor. Tente também  <b>*=value</"
+"b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
@@ -2694,6 +2709,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
 msgid "<b>user:</b>... - all objects changed by user"
-msgstr ""
-"<b>user:</b>... - todos os objetos modificados por determinado usuário"
+msgstr "<b>user:</b>... - todos os objetos modificados por determinado usuário"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
@@ -2724,6 +2738,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 ""
 "<b>nós:</b>... - objeto com números de nós determinado (nós:quantidade ou "
@@ -2983,6 +2997,6 @@
 msgstr ""
 "<html>{0} relações formam um ciclo porque elas referem umas às outras.<br>O "
-"JOSM não pode enviá-las. Por favor edite-as e remova a dependência "
-"cíclica.</html>"
+"JOSM não pode enviá-las. Por favor edite-as e remova a dependência cíclica.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
@@ -3013,10 +3027,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
@@ -3142,5 +3160,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
@@ -3221,7 +3239,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 ""
 "Você está a ponto de apagar nós fora da área que fez download de dados.<br> "
@@ -3270,11 +3288,11 @@
 msgstr[1] "Mover {0} nós"
 
-#: ../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 "Eliminado objeto ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111
 #, java-format
 msgid "Purged {0} object"
@@ -3283,5 +3301,5 @@
 msgstr[1] "{0} objetos eliminados"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 #, java-format
 msgid ""
@@ -3292,5 +3310,5 @@
 "2. Atualmente é {1}"
 
-#: ../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}"
@@ -3512,6 +3530,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 ""
 "<html>O ficheiro de preferências contêm erros.<br> A fazer uma cópia de "
@@ -3606,5 +3624,5 @@
 #. *
 #. * the decimal format 999.999
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3613,5 +3631,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3620,5 +3638,5 @@
 #. *
 #. * coordinates East/North
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3671,4 +3689,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}"
@@ -3680,33 +3701,24 @@
 msgstr "Faltando alvo de mescla para objeto com id {0}"
 
-#: ../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 "Faltando alvo de mescla para nó com id {0}"
 
-#: ../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 "Faltando alvo de mescla para relação com id {0}"
 
-#: ../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 "Faltando alvo de mescla para tipo {0} com id {1}"
-
-#. 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 ""
-"Objeto alvo com id {0} e versão {1} é visível, porém o source do objeto com "
-"versão menor {2} não é visível. Não é possível lidar com essa "
-"inconsistência. Mantendo objeto alvo. "
 
 #. translators notes must be in front
@@ -3784,19 +3796,19 @@
 msgstr "</p><p>Feche a janela de filtros para ver todos objetos.<p></html>"
 
-#: ../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 "Uma primitiva com ID = 0 não pode ser invisível."
 
-#: ../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 "ID > 0 esperada. Obtida {0}."
 
-#: ../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 "Esperada Versão> 0. Obtida {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:795
 #, java-format
 msgid ""
@@ -3807,5 +3819,5 @@
 "do changesetId é {0}"
 
-#: ../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 "
@@ -3815,5 +3827,5 @@
 "outra não"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1169
 #, java-format
 msgid ""
@@ -3873,9 +3885,8 @@
 #: ../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}''."
-msgstr ""
-"Não é possível comparar a primitiva com ID \"{0}\" com a primitiva ID "
-"\"{1}\"."
+msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgstr ""
+"Não é possível comparar a primitiva com ID \"{0}\" com a primitiva ID \"{1}"
+"\"."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
@@ -3889,5 +3900,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 "selecionado"
@@ -4053,6 +4064,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 ""
 "<html>Não foi possível ler favoritos de<br>''{0}''<br>O erro foi: {1}</html>"
@@ -4124,5 +4134,5 @@
 #. color tiger_data
 #. </rule>
-#. 
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4132,5 +4142,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4139,5 +4149,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4146,5 +4156,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4153,5 +4163,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4160,5 +4170,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4167,9 +4177,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--annotation tags -->
-#. 
+#.
 #. <!--"work in progress" tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="building"/>
@@ -4178,5 +4188,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 "prédio"
@@ -4263,5 +4273,5 @@
 msgstr "Objeto apagado"
 
-#: ../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
@@ -4390,6 +4400,6 @@
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
-"Abrir um arquivo (qualquer tipo de arquivo que pode ser aberto via "
-"Arquivo/Abrir)"
+"Abrir um arquivo (qualquer tipo de arquivo que pode ser aberto via Arquivo/"
+"Abrir)"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
@@ -4488,6 +4498,5 @@
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
-msgstr ""
-"Configuração {0} das preferências foi removida pois não é mais usada."
+msgstr "Configuração {0} das preferências foi removida pois não é mais usada."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
@@ -4497,5 +4506,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
@@ -4504,4 +4513,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
@@ -4671,6 +4681,6 @@
 "relations</strong>.</html>"
 msgstr ""
-"<html>Por favor confirme para remover <strong>1 objeto</strong>  de "
-"<strong>{0} relações</strong>.</html>"
+"<html>Por favor confirme para remover <strong>1 objeto</strong>  de <strong>"
+"{0} relações</strong>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156
@@ -4711,5 +4721,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
@@ -4750,11 +4760,11 @@
 "<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>"
-msgstr ""
-"<html>Como alternativa você pode digitar o <strong>endereço de um "
-"tile</strong> no formato <i>nível de zoom/x/y</i>, i.e. <i>15/256/223</i>. "
-"Os endereços no formato <i>zoom,x,y</i> ou <i>zoom;x;y</i> também são "
-"válidos.</html>"
+"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"html>"
+msgstr ""
+"<html>Como alternativa você pode digitar o <strong>endereço de um tile</"
+"strong> no formato <i>nível de zoom/x/y</i>, i.e. <i>15/256/223</i>. Os "
+"endereços no formato <i>zoom,x,y</i> ou <i>zoom;x;y</i> também são válidos.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
@@ -4784,5 +4794,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"
@@ -4791,5 +4801,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"
@@ -4798,5 +4808,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"
@@ -4991,6 +5001,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:427
 msgid "Copy my selected nodes to the start of the merged node list"
-msgstr ""
-"Copiar meus nós selecionados para o início da lista de nós combinados"
+msgstr "Copiar meus nós selecionados para o início da lista de nós combinados"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:452
@@ -5028,6 +5037,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 ""
 "Copiar os elementos selecionados deles para o fim da lista de elementos "
@@ -5113,6 +5121,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their "
-"entries.</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 "<html>Clique <strong>{0}</strong> para começar a combinar as minhas entradas "
@@ -5122,6 +5130,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their "
-"entries.</html>"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
+"html>"
 msgstr ""
 "<html>Clique <strong>{0}</strong> para terminar de combinar as minhas "
@@ -5178,9 +5186,9 @@
 #, java-format
 msgid ""
-"<html>An error occurred while communicating with the server<br>Details: "
-"{0}</html>"
-msgstr ""
-"<html>Um erro ocorreu durante a comunicação com o servidor.<br>Detalhes: "
-"{0}</html>"
+"<html>An error occurred while communicating with the server<br>Details: {0}</"
+"html>"
+msgstr ""
+"<html>Um erro ocorreu durante a comunicação com o servidor.<br>Detalhes: {0}"
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
@@ -5415,10 +5423,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"
@@ -5427,10 +5437,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
@@ -5512,4 +5524,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 "nenhum"
@@ -5679,6 +5692,6 @@
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
 msgstr ""
-"<html>Digite o valor da tag, ex.: <strong><tt>verifique os "
-"membros</tt></strong></html>"
+"<html>Digite o valor da tag, ex.: <strong><tt>verifique os membros</tt></"
+"strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
@@ -5729,6 +5742,6 @@
 msgid "<html>Please select the values to keep for the following tags.</html>"
 msgstr ""
-"<html>Por favor selecione os valores para manter as seguintes "
-"etiquetas.</html>"
+"<html>Por favor selecione os valores para manter as seguintes etiquetas.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:48
@@ -5746,7 +5759,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 ""
 "<html>Marque para mostrar os conjuntos de modificações somente para a "
@@ -5776,6 +5789,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 ""
 "Baixar informações sobre os conjuntos de modificações selecionados do "
@@ -5825,5 +5837,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
@@ -5900,17 +5912,16 @@
 #, 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 ""
 "<html>Você não terminou de combinar as diferenças nesse conflito.<br>As "
 "resoluções de conflito não serão aplicadas a não ser que todas as "
 "diferenças<br>sejam resolvidas.<br>Clique <strong>{0}</strong> para fechar "
-"mesmo assim.<strong>Diferenças<br>já resolvidas não serão "
-"aplicadas.<strong><br>Clique <strong>{1}</strong> para retornar à resolução "
-"de conflitos.</html>"
+"mesmo assim.<strong>Diferenças<br>já resolvidas não serão aplicadas."
+"<strong><br>Clique <strong>{1}</strong> para retornar à resolução de "
+"conflitos.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
@@ -5932,5 +5943,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
@@ -5938,5 +5949,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 "Adicionar"
@@ -5985,5 +5996,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 "Histórico"
@@ -6203,10 +6214,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 "Selecionar na lista de relações"
 
 #: ../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 "Selecionar uma relação na lista de relações"
@@ -6323,6 +6334,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:183
 msgid "Display the objects created, updated, and deleted by the changeset"
-msgstr ""
-"Mostra os objetos criados, atualizados, e removidos por este changeset"
+msgstr "Mostra os objetos criados, atualizados, e removidos por este changeset"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:267
@@ -7646,6 +7656,6 @@
 msgid "Only changesets closed after and created before a specific date/time"
 msgstr ""
-"Apenas conjuntos de modificações fechados depois, e criados antes deste "
-"dia/hora"
+"Apenas conjuntos de modificações fechados depois, e criados antes deste dia/"
+"hora"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
@@ -7711,6 +7721,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 ""
 "Por favor informe uma data no formato usual da sua localidade.<br>Exemplo: "
@@ -7741,13 +7751,13 @@
 #: ../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 ""
 "<html>Por gentileza selecione uma destas <strong>consultas-padrão</strong>. "
 "Selecione <strong>Baixar apenas meus conjuntos de modificações</strong> se "
-"você quer baixar os conjuntos de modificações criados por você "
-"mesmo.<br>Lembre-se que o JOSM vai baixar no no máximo 100 conjuntos de "
+"você quer baixar os conjuntos de modificações criados por você mesmo."
+"<br>Lembre-se que o JOSM vai baixar no no máximo 100 conjuntos de "
 "modificações.</html>"
 
@@ -7762,6 +7772,6 @@
 msgstr ""
 "<html>Baixar meus conjuntos de modificações abertos<br><em>Desabilitado. Por "
-"gentileza, primeiro informe o seu nome de usuário do OSM mas "
-"preferências.</em></html>"
+"gentileza, primeiro informe o seu nome de usuário do OSM mas preferências.</"
+"em></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:157
@@ -7774,13 +7784,13 @@
 "currently no map view active.</em></html>"
 msgstr ""
-"<html>Baixar os conjuntos de modificações da visualização atual do "
-"mapa.<br><em>Desabilitado. Não há nenhum mapa sendo visualizado "
-"atualmente.</em></html>"
+"<html>Baixar os conjuntos de modificações da visualização atual do mapa."
+"<br><em>Desabilitado. Não há nenhum mapa sendo visualizado atualmente.</em></"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:168
 msgid "<html>Download changesets in the current map view</html>"
 msgstr ""
-"<html>Baixar os conjuntos de modificações da visualização atual do "
-"mapa</html>"
+"<html>Baixar os conjuntos de modificações da visualização atual do mapa</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:193
@@ -7883,9 +7893,9 @@
 msgstr "Esta URL de pesquisa de conjunto de modificações é inválido"
 
-#: ../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 "Adicionar Propriedades"
 
-#: ../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."
@@ -7894,23 +7904,23 @@
 msgstr[1] "Isto vai mudar até {0} objetos."
 
-#: ../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 "Um valor vazio deleta a tag."
 
-#: ../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 "<diferente>"
 
-#: ../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 "Modificar valores?"
 
-#: ../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"
@@ -7919,5 +7929,5 @@
 msgstr[1] "Modificar propriedades de até {0} objetos"
 
-#: ../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."
@@ -7926,77 +7936,77 @@
 msgstr[1] "Isto modificará {0} objetos."
 
-#: ../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 "Por favor, selecione uma chave"
 
-#: ../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 "Por favor, selecione um valor"
 
-#: ../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 "Por favor, selecione os objetos que deseja modificar propriedades."
 
-#: ../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 "Propriedades/Associações"
 
-#: ../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 "Propriedades dos objetos selecionados."
 
 #. 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 "Membro de"
 
-#: ../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 "Posição"
 
-#: ../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 "Propriedades: {0} / Membros: {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 "Propriedades / Associações"
 
-#: ../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 "Modificar relação"
 
-#: ../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 "Deletar da relação"
 
-#: ../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 "Confirmar a exclusão da relação {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 "Excluir a chave selecionada em todos objetos"
 
-#: ../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 "Excluir Propriedades"
 
-#: ../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 "Adicionar um novo par chave/valor para todos objetos"
 
-#: ../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 "Editar o valor da chave selecionada para todos objetos"
 
-#: ../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 "Selecionar relação"
 
-#: ../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 "Selecione a relação na seleção principal."
@@ -8113,10 +8123,10 @@
 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>"
-msgstr ""
-"<html>Há ao menos um membro nessa relação referenciando<br>a própria "
-"relação.<br>Isso cria dependências circulares e não é recomendado.<br>Como "
-"você deseja proceder em relação a dependências circulares?</html>"
+"relation itself.<br>This creates circular dependencies and is discouraged."
+"<br>How do you want to proceed with circular dependencies?</html>"
+msgstr ""
+"<html>Há ao menos um membro nessa relação referenciando<br>a própria relação."
+"<br>Isso cria dependências circulares e não é recomendado.<br>Como você "
+"deseja proceder em relação a dependências circulares?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
@@ -8133,6 +8143,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 ""
 "<html>Essa relação já tem um ou mais membros se referindo à<br>primitiva "
@@ -8309,11 +8319,9 @@
 #, java-format
 msgid ""
-"<html>Layer ''{0}'' already has a conflict for "
-"primitive<br>''{1}''.<br>Please resolve this conflict first, then try "
-"again.</html>"
-msgstr ""
-"<html>A camada \"{0}\" já tem um conflito para a "
-"primitiva<br>\"{1}\".<br>Por favor, primeiro resolva esse conflito e então "
-"tente de novo.</html>"
+"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
+"<br>Please resolve this conflict first, then try again.</html>"
+msgstr ""
+"<html>A camada \"{0}\" já tem um conflito para a primitiva<br>\"{1}\"."
+"<br>Por favor, primeiro resolva esse conflito e então tente de novo.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
@@ -8407,6 +8415,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:211
 msgid "Zooming disabled because layer of this relation is not active"
-msgstr ""
-"Visualização desabilitada porque a camada dessa relação não está ativa"
+msgstr "Visualização desabilitada porque a camada dessa relação não está ativa"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:216
@@ -8660,7 +8667,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 ""
 "<html>Nem <strong>{0}</strong> nem <strong>{1}</strong> estão ativos.<br>Por "
@@ -8803,14 +8809,14 @@
 "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 ""
 "<html><p class=\"warning-header\">Conteúdo de ajuda para o tópico não "
-"existe</p><p class=\"warning-body\">O conteúdo do tópico de ajuda "
-"<strong>{0}</strong> ainda não está disponível. Ele está faltando tanto na "
-"sua língua local ({1}) como em inglês.<br><br>Por favor ajude a melhorar o "
-"sistema de ajuda do JOSM inserindo a informação que está faltando. Você pode "
-"tanto editar o <a href=\"{2}\">tópico de ajuda no seu idioma ({1})</a> ou o "
-"<a href=\"{3}\">tópico de ajudo em inglês</a>.</p></html>"
+"existe</p><p class=\"warning-body\">O conteúdo do tópico de ajuda <strong>{0}"
+"</strong> ainda não está disponível. Ele está faltando tanto na sua língua "
+"local ({1}) como em inglês.<br><br>Por favor ajude a melhorar o sistema de "
+"ajuda do JOSM inserindo a informação que está faltando. Você pode tanto "
+"editar o <a href=\"{2}\">tópico de ajuda no seu idioma ({1})</a> ou o <a "
+"href=\"{3}\">tópico de ajudo em inglês</a>.</p></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
@@ -8819,11 +8825,11 @@
 "<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 ""
 "<html><p class=\"error-header\">Erro buscando informação de ajuda</p><p "
 "class=\"error-body\">O conteúdo do tópico de ajuda <strong>{0}</strong> não "
-"pode ser carregado. A mensagem de erro é (sem "
-"tradução):<br><tt>{1}</tt></p></html>"
+"pode ser carregado. A mensagem de erro é (sem tradução):<br><tt>{1}</tt></"
+"p></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355
@@ -9107,9 +9113,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 ""
 "<html>Envio <strong>falhou</strong> porque o servidor tem uma nova versão de "
@@ -9118,6 +9123,6 @@
 "{2}, e sua versão é {3}.<br><br>Clique <strong>{4}</strong> para sincronizar "
 "somente a primitiva conflitante.<br>Clique <strong>{5}</strong> para "
-"sincronizar todo o conjunto de dados locais no servidor<br>Clique "
-"<strong>{6}</strong> para abortar e continuar editando.<br></html>"
+"sincronizar todo o conjunto de dados locais no servidor<br>Clique <strong>{6}"
+"</strong> para abortar e continuar editando.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
@@ -9131,14 +9136,12 @@
 msgid ""
 "<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click "
-"<strong>{0}</strong> to synchronize the entire local dataset with the "
-"server.<br>Click <strong>{1}</strong> to abort and continue "
-"editing.<br></html>"
+"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
+"</strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{1}</strong> to abort and continue editing.<br></html>"
 msgstr ""
 "<html>Envio <strong>falhou</strong> porque o servidor tem uma nova versão de "
-"um<br> de seus nós, caminhos ou relações..<br><br>Clique "
-"<strong>{0}</strong> para sincronizar todos o conjuntos de dados locais com "
-"o servidor.<br>Clique <strong>{1}</strong> para abortar e continuar "
-"editando.<br></html>"
+"um<br> de seus nós, caminhos ou relações..<br><br>Clique <strong>{0}</"
+"strong> para sincronizar todos o conjuntos de dados locais com o servidor."
+"<br>Clique <strong>{1}</strong> para abortar e continuar editando.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194
@@ -9192,6 +9195,5 @@
 #, java-format
 msgid "Warning: error header \"{0}\" did not match with an expected pattern"
-msgstr ""
-"Aviso: o cabeçalho de erro {0} não é compatível com o padrão esperado"
+msgstr "Aviso: o cabeçalho de erro {0} não é compatível com o padrão esperado"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
@@ -9258,6 +9260,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:309
 msgid "Load the list of your open changesets from the server"
-msgstr ""
-"Baixar do servidor a lista dos seus conjuntos de modificações abertos"
+msgstr "Baixar do servidor a lista dos seus conjuntos de modificações abertos"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:327
@@ -9268,6 +9269,6 @@
 msgid "<html>Please select the changesets you want to close</html>"
 msgstr ""
-"<html>Por favor selecione os conjuntos de modificações que você quer "
-"fechar</html>"
+"<html>Por favor selecione os conjuntos de modificações que você quer fechar</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88
@@ -9409,5 +9410,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 "Não"
@@ -9415,6 +9416,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 ""
 "A camada ''{0}'' tem modificações que deveriam ser enviadas ao servidor."
@@ -9503,6 +9503,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] ""
@@ -9516,6 +9516,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 "
@@ -9556,6 +9556,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
-msgstr ""
-"Sair do JOSM salvando. Mudanças não salvas serão enviadas e/ou salvas."
+msgstr "Sair do JOSM salvando. Mudanças não salvas serão enviadas e/ou salvas."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
@@ -9748,5 +9747,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9772,12 +9771,10 @@
 
 #: ../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 "Este conjunto de dados será <strong>fechado</strong> depois do envio"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:57
 msgid "The changeset is <strong>left open</strong> after this upload"
-msgstr ""
-"O conjunto de dados <strong>continuará aberto</strong> depois do envio"
+msgstr "O conjunto de dados <strong>continuará aberto</strong> depois do envio"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:59
@@ -9839,6 +9836,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 ""
 "Enviando <strong>{0} objetos</strong> para <strong>vários conjuntos de "
@@ -9896,7 +9893,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 ""
 "Clique ''<strong>{0}</strong>'' para continuar enviando para conjuntos de "
@@ -9910,5 +9907,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9927,5 +9924,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..."
@@ -9936,6 +9933,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 ""
 "Ignorando exceção capturada porque o envio de dados foi cancelado. Exceção é "
@@ -10165,7 +10161,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 ""
 
@@ -10191,7 +10187,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 ""
 
@@ -10255,6 +10251,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 ""
 "<html>O envio de dados não processados de GPS como mapa é considerado "
@@ -10438,6 +10434,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 ""
 
@@ -10497,7 +10493,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 ""
 
@@ -11045,5 +11041,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
 msgid "Click to reset the OAuth settings to default values"
-msgstr ""
+msgstr "Clique para redefinir as configurações do OAuth para os valores padrão"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
@@ -11077,6 +11073,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 ""
 
@@ -11098,13 +11094,13 @@
 #: ../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."
-msgstr ""
-"Por favor digite o seu nome de usuário e senha do OSM. A senha "
-"<strong>não</strong> será salva em texto puro nas preferências do JOSM, e "
-"será enviada ao servidor do OSM <strong>apenas uma vez</strong>. Requisições "
-"de envio posteriores não usarão mais a sua senha."
+"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 ""
+"Por favor digite o seu nome de usuário e senha do OSM. A senha <strong>não</"
+"strong> será salva em texto puro nas preferências do JOSM, e será enviada ao "
+"servidor do OSM <strong>apenas uma vez</strong>. Requisições de envio "
+"posteriores não usarão mais a sua senha."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:111
@@ -11125,7 +11121,7 @@
 "(HTTPS)."
 msgstr ""
-"<strong>Cuidado:</strong> A senha é transferida <strong>apenas uma "
-"vez</strong> em texto puro para o website do OSM. <strong>Não use</strong> "
-"uma senha importante até que o servidor do OSM disponibilize um canal de "
+"<strong>Cuidado:</strong> A senha é transferida <strong>apenas uma vez</"
+"strong> em texto puro para o website do OSM. <strong>Não use</strong> uma "
+"senha importante até que o servidor do OSM disponibilize um canal de "
 "comunicação encriptado (HTTPS)."
 
@@ -11236,11 +11232,11 @@
 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 ""
 "<html>O processo automático de obtenção de um Token de Acesso OAuth<br>do "
 "servidor do OSM falhou. O JOSM falhou ao logar-se no {0}<br>para o usuário "
-"{1}.<br><br>Por favor, confira o nome de usuário e senha e tente "
-"novamente.</html>"
+"{1}.<br><br>Por favor, confira o nome de usuário e senha e tente novamente.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:58
@@ -11356,6 +11352,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 ""
 
@@ -11500,8 +11495,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 ""
 
@@ -11588,8 +11583,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 ""
 
@@ -11616,7 +11611,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 ""
 
@@ -11668,5 +11663,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 "Por favor, selecione a linha para apagar."
@@ -11768,6 +11763,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
 msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr ""
-"O montante pelo qual a velocidade é multiplicada para o avanço rápido"
+msgstr "O montante pelo qual a velocidade é multiplicada para o avanço rápido"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
@@ -12039,6 +12033,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 ""
 "Desenha as setas de direção  usando tabelas de pesquisa ao invés de cálculos "
@@ -12102,6 +12095,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 ""
 
@@ -12173,5 +12165,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 "Habilitar padrões embutidos"
@@ -12191,6 +12183,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>:"
@@ -12317,6 +12308,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 ""
 
@@ -12329,9 +12320,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 ""
 
@@ -12631,6 +12622,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 ""
 
@@ -12641,5 +12632,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 ""
@@ -12649,18 +12640,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 ""
@@ -12669,5 +12660,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 ""
@@ -12676,5 +12667,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 ""
@@ -12683,9 +12674,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 "Ordenar menu de predefinições"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
 msgid "Tagging Presets"
 msgstr "Padrões de predefinições"
@@ -12800,6 +12791,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 ""
 
@@ -12821,6 +12812,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 ""
 
@@ -12885,6 +12876,6 @@
 "gravada em texto puro no arquivo de preferências do JOSM. Além disso, ela é "
 "transferida <strong>sem criptografia</strong> em cada pedido enviado ao "
-"servidor do OSM. <strong>Não use uma senha compartilhada com outros "
-"serviços.</strong></p></body></html>"
+"servidor do OSM. <strong>Não use uma senha compartilhada com outros serviços."
+"</strong></p></body></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:117
@@ -12905,6 +12896,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 ""
 
@@ -12922,6 +12912,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 ""
 "Você já tem um token de acesso para acessar o servidor do OSM usando OAuth."
@@ -13021,6 +13010,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 ""
 "Usar as configurações-padrão do sistema (desabilitado. Inicie o JOSM com "
@@ -13158,4 +13147,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 "Alterar propriedades"
@@ -13323,5 +13313,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
@@ -13345,5 +13335,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}''"
@@ -13512,6 +13502,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 ""
 
@@ -13628,10 +13617,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 ""
@@ -13639,69 +13628,69 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
 msgid "Creating changeset..."
 msgstr "Criando conjunto de modificações..."
 
-#: ../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 "Aberto com sucesso o conjunto de modificações {0}"
 
-#: ../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 "Esperava-se um ID de conjunto de modificações > 0. Recebi {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349
 msgid "Updating changeset..."
 msgstr "Atualizando conjunto de modificações..."
 
-#: ../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 "Atualizando conjunto de modificações {0}..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:388
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389
 msgid "Closing changeset..."
 msgstr "Fechando conjunto de mudanças..."
 
-#: ../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 "Preparando requisição de envio..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447
 msgid "Waiting 10 seconds ... "
 msgstr "Esperando 10 segundos ... "
 
-#: ../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 "OK - tentando de novo."
 
-#: ../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}."
@@ -13879,4 +13868,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})"
@@ -13896,6 +13886,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 ""
 
@@ -13923,6 +13913,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 ""
 
@@ -13964,6 +13954,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 ""
 
@@ -14401,6 +14390,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 ""
 
@@ -14612,6 +14601,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 ""
 
@@ -14680,5 +14668,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"
@@ -14764,6 +14752,6 @@
 msgid ""
 "<html>Uploading to the server <strong>failed</strong> because your "
-"current<br>dataset violates a precondition.<br>The error message "
-"is:<br>{0}</html>"
+"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
+"html>"
 msgstr ""
 "<html>Envio ao servidor <strong>falhou</strong> porque seu conjunto<br> de "
@@ -14773,7 +14761,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 ""
 
@@ -14781,7 +14769,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 ""
 
@@ -14789,8 +14777,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 ""
 
@@ -14812,7 +14800,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 ""
 
@@ -14883,7 +14871,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 ""
 
@@ -14895,7 +14882,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 ""
 
@@ -14927,6 +14914,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 ""
 
@@ -15445,6 +15432,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>"
@@ -15471,6 +15458,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"
@@ -15508,6 +15495,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"
@@ -15523,7 +15510,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"
@@ -15574,9 +15561,29 @@
 msgstr "Números:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:134
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#, fuzzy
+msgid "Big buildings mode"
+msgstr "Informe o tamanho do prédio"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#, fuzzy
+msgid "Rotate crosshair"
+msgstr "Girar para a direita"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#, fuzzy
+msgid "Advanced settings"
+msgstr "Configurar definições avançadas"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#, fuzzy
+msgid "Building tag:"
+msgstr "Edificação"
+
+#: ../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"
@@ -15585,36 +15592,47 @@
 #: ../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 "Informe o tamanho do prédio"
 
-#: ../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 "Criar um prédio"
+
+#: ../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
+#, fuzzy
+msgid "Advanced..."
+msgstr "Avançado"
+
+#: ../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"
-msgstr ""
+#: ../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
+#, fuzzy
+msgid "Set width of the building"
+msgstr "Criar um prédio"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
@@ -15790,7 +15808,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--waterway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15800,5 +15818,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15808,5 +15826,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15822,5 +15840,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15830,5 +15848,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15836,8 +15854,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 "água"
@@ -15859,5 +15877,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15866,5 +15884,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15873,5 +15891,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15880,5 +15898,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15887,5 +15905,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15894,10 +15912,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 "endereço"
@@ -15926,11 +15944,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 ""
 
@@ -16360,6 +16377,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 "Camada vazia"
@@ -16541,4 +16558,52 @@
 msgid "No GPX data layer found."
 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 "Editar Zoológico"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#, fuzzy
+msgid "Name:"
+msgstr "Nome"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#, fuzzy
+msgid "CmdLine:"
+msgstr "Coordenadas:"
+
+#: ../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
+#, fuzzy, java-format
+msgid "Delete tool \"{0}\"?"
+msgstr "Apagar nó {0}"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:74
+msgid "Are you sure?"
+msgstr "Você tem certeza?"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
+#, fuzzy
+msgid "New tool..."
+msgstr "Nova regra"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
+#, fuzzy
+msgid "Install"
+msgstr "Industrial"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
@@ -16806,5 +16871,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#. 
+#.
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16925,6 +16990,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 ""
 
@@ -16943,7 +17007,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 ""
 
@@ -17250,6 +17313,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 ""
 
@@ -17359,6 +17421,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 ""
 
@@ -17409,6 +17470,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 ""
 
@@ -17777,5 +17837,5 @@
 msgstr "Reverter"
 
-#: ../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}"
@@ -17826,4 +17886,41 @@
 msgid "Revert changeset #{0}"
 msgstr ""
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:78
+#, fuzzy
+msgid "Road Sign Plugin"
+msgstr "Carregando plugins"
+
+#: ../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 "Não foi possível ler a fonte de preferência de tags: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
+#, fuzzy, java-format
+msgid "Error parsing tagging preset from ''{0}'':\n"
+msgstr "Baixando lista de plugins a partir de \"{0}\""
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:104
+#, fuzzy, java-format
+msgid "Sign {0}"
+msgstr "Seleção: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:111
+#, fuzzy, java-format
+msgid "Additional sign {0}"
+msgstr "Adicionar relação {0}"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -17930,4 +18027,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 "Simplificar caminho"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
+#, fuzzy
+msgid "Delete unnecessary nodes from an area."
+msgstr "Apagar nós desnecessários de uma caminho."
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
 msgid "Slippy Map"
@@ -18696,6 +18804,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:164
 msgid "Display and manage turn restrictions in the current data set"
-msgstr ""
-"Mostrar e gerencias restrições de conversão no conjunto de dados atual"
+msgstr "Mostrar e gerencias restrições de conversão no conjunto de dados atual"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
@@ -18725,6 +18832,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 ""
 "O desenvolvimento do plugin de restrições de conversão é patrocinado por <a "
@@ -18821,13 +18928,13 @@
 #, 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."
-msgstr ""
-"Esta restrição de conversão usa o caminho do OSM <span class=\"object-"
-"name\">{0}</span> com a regra <tt>from</tt> <strong>e</strong> com a regra "
-"<tt>to</tt>. Em uma restrição de conversão, o caminho com a regra "
-"<tt>from</tt> deve ser diferente do caminho com a regra <tt>to</tt>."
+"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 ""
+"Esta restrição de conversão usa o caminho do OSM <span class=\"object-name\">"
+"{0}</span> com a regra <tt>from</tt> <strong>e</strong> com a regra <tt>to</"
+"tt>. Em uma restrição de conversão, o caminho com a regra <tt>from</tt> deve "
+"ser diferente do caminho com a regra <tt>to</tt>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:37
@@ -18882,8 +18989,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 ""
 
@@ -19008,6 +19115,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 ""
 
@@ -19015,6 +19122,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 ""
 
@@ -19667,7 +19774,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 ""
 
@@ -19863,9 +19969,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 ""
@@ -19962,11 +20068,146 @@
 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
+#, fuzzy, java-format
+msgid "{0} {1}% of GPS track"
+msgstr "{0} consiste em {1} trilha"
+
+#: ../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 "Importar Áudio"
+
+#: ../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 "Remover"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
+#, fuzzy
+msgid "removes current video from layer"
+msgstr "Remover foto da camada"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
+#, fuzzy
+msgid "play/pause"
+msgstr "Tocar/Pausar"
+
+#: ../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 "segundo plano"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
+#, fuzzy
+msgid "jumps n sec back"
+msgstr "Pular de volta."
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "forward"
+msgstr "Avançar"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "jumps n sec forward"
+msgstr "Pular a frente"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
+#, fuzzy
+msgid "faster"
+msgstr "Mais rápido"
+
+#: ../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 "Lento"
+
+#: ../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
+msgid "loops n sec around current position"
+msgstr ""
+
+#. 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
+#, fuzzy
+msgid "Jump length"
+msgstr "Ir ali"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#, fuzzy
+msgid "Set the length of a jump"
+msgstr "Definir o idioma"
+
+#: ../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
+#, fuzzy
+msgid "Loop length"
+msgstr "Comprimento"
+
+#: ../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 "camada"
+
+#: ../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 ""
 
@@ -20179,28 +20420,28 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
 msgid "Automatic downloading"
 msgstr ""
 
-#: ../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 ""
@@ -20211,113 +20452,113 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Yes, fetch images"
 msgstr "Sim, buscar imagens"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Invalid URL?"
 msgstr "URL inválido?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311
 msgid "Download visible tiles"
 msgstr "Baixar imagens visíveis"
 
-#: ../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 "Mudar resolução"
 
-#: ../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 "Canal alfa"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385
 msgid "Save WMS layer to file"
 msgstr "Salvar camada WMS para arquivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
 msgid "Save WMS layer"
 msgstr "Salvar camada WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413
 msgid "Load WMS layer from file"
 msgstr "Carregar camada WMS de um arquivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
 msgid "Load WMS layer"
 msgstr "Carregar camada WMS"
 
-#: ../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 ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
 msgid "File Format Error"
 msgstr "Erro no formato do arquivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449
 msgid "Error loading file"
 msgstr "Erro ao carregar arquivo"
 
-#: ../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 ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
 msgid "WMS Plugin Preferences"
 msgstr "Preferências do plugin WMS"
 
-#: ../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 "Modifica a lista de servidores WMS exibidos no menu do plugin WMS"
 
-#: ../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 "Nome do Menu"
 
-#: ../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 "URL do WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "Menu Name (Default)"
 msgstr "Nome do Menu (Padrão)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "WMS URL (Default)"
 msgstr "URL do WMS (Padrão)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:86
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
 msgid "Enter a menu name and WMS URL"
 msgstr "Digite o nome do menu e a URL do WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:111
 msgid "Copy Selected Default(s)"
 msgstr "Copiar o(s) padrão(ões) selecionados"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
 msgid "Please select at least one row to copy."
 msgstr "Por gentileza selecione ao menos uma linha para copiar."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
 msgid "Downloader:"
 msgstr "Recebedor:"
@@ -20334,4 +20575,9 @@
 msgid "% of north:"
 msgstr "% ao norte:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186
+#, fuzzy
+msgid "Simultaneous connections"
+msgstr "Nó: conexão"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -20343,7 +20589,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
@@ -20393,8 +20639,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 "floresta"
@@ -20411,7 +20657,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--boundary tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -20421,5 +20667,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -20462,5 +20708,5 @@
 #. color boundary
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -20470,5 +20716,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -20478,5 +20724,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -20486,15 +20732,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 "limite"
@@ -20510,5 +20756,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -20517,7 +20763,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--route tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -20527,5 +20773,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -20535,5 +20781,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -20543,5 +20789,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -20551,5 +20797,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -20559,5 +20805,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -20567,5 +20813,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -20575,12 +20821,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 "rota"
@@ -20859,21 +21105,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 "
@@ -20883,10 +21128,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."
@@ -20894,5 +21139,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 "
@@ -20902,15 +21147,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 "
@@ -20919,5 +21164,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 "
@@ -20927,15 +21172,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:48
 msgid "Displays an OpenLayers background image"
 msgstr "Mostrar imagens de fundo do OpenLayers"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:50
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importar problemas do OpenStreetBugs"
 
 #. 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"
@@ -20943,5 +21188,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."
@@ -20949,5 +21194,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 "
@@ -20958,5 +21203,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 "
@@ -20965,10 +21210,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."
@@ -20976,15 +21221,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 "
@@ -20993,10 +21239,17 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:71
 msgid "Provides routing capabilities."
 msgstr "Possibilita capacidade de roteamento."
 
+#. 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 "
@@ -21005,15 +21258,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 "
@@ -21023,10 +21276,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). "
@@ -21035,5 +21288,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) "
@@ -21042,5 +21295,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:89
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21049,10 +21302,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 "
@@ -21061,5 +21314,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 "
@@ -21069,5 +21322,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:97
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21076,15 +21329,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 "
@@ -21093,10 +21346,10 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:105
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
 msgstr ""
-"Mostrar imagens georeferenciadas como fundo no JOSM (servidores WMS, Yahoo, "
-"...)."
+"Mostrar imagens georeferenciadas como fundo no JOSM (servidores WMS, "
+"Yahoo, ...)."
 
 #. <!--
@@ -21983,10 +22236,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 "rotatória"
@@ -22123,8 +22376,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"/>
@@ -22334,5 +22587,5 @@
 #. color motorroad
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -22342,5 +22595,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -22359,5 +22612,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -22367,5 +22620,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -22384,5 +22637,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -22392,5 +22645,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -22409,5 +22662,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -22417,5 +22670,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -22430,5 +22683,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -22446,8 +22699,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 ""
@@ -22462,5 +22715,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -22469,5 +22722,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--public_transport tags -->
 #. <rule>
@@ -22477,10 +22730,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 "serviço"
@@ -22495,5 +22748,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -22502,5 +22755,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -22510,10 +22763,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 "construção"
@@ -23519,9 +23772,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 ""
@@ -23851,5 +24104,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -23859,5 +24112,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -23867,5 +24120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -23875,5 +24128,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -23883,5 +24136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -23891,5 +24144,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -23899,5 +24152,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -23908,5 +24161,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -23914,9 +24167,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 "trilho"
@@ -25326,5 +25579,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -25334,5 +25587,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -25342,5 +25595,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -25350,5 +25603,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -25712,7 +25965,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--sport tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -25722,5 +25975,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -25730,5 +25983,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -25738,5 +25991,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -25746,5 +25999,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -25754,5 +26007,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -25762,5 +26015,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -25770,5 +26023,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -25778,5 +26031,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -25786,5 +26039,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -25794,5 +26047,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -25802,5 +26055,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -25810,5 +26063,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -25818,5 +26071,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -25826,5 +26079,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -25834,5 +26087,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -25842,5 +26095,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -25850,5 +26103,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -25858,5 +26111,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -25866,5 +26119,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -25874,5 +26127,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -25882,5 +26135,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -25890,5 +26143,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -25898,5 +26151,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -25906,5 +26159,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -25914,5 +26167,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -25922,5 +26175,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -25930,5 +26183,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -25938,5 +26191,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -25946,5 +26199,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -25954,5 +26207,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -25962,5 +26215,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -25970,5 +26223,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -25978,5 +26231,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -25986,5 +26239,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -25994,5 +26247,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -26002,5 +26255,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -26010,5 +26263,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -26018,5 +26271,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -26026,5 +26279,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -26034,5 +26287,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -26042,5 +26295,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -26050,5 +26303,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -26058,5 +26311,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -26066,5 +26319,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -26074,5 +26327,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -26082,33 +26335,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 "esporte"
@@ -27786,7 +28039,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--landuse tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -27796,5 +28049,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -27804,5 +28057,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -27812,5 +28065,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -27820,5 +28073,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -27828,5 +28081,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -27836,5 +28089,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -27844,5 +28097,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -27852,12 +28105,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 "verde"
@@ -29273,5 +29526,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -29287,5 +29540,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -29295,18 +29548,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 -->
@@ -29315,7 +29585,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- cycleway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -29325,5 +29595,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -29333,5 +29603,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -29341,5 +29611,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -29349,12 +29619,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 "bicicleta"
@@ -29381,5 +29652,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -29395,5 +29666,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -29403,5 +29674,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -29410,13 +29681,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"/>
@@ -29427,11 +29706,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 "a pé"
@@ -29450,8 +29730,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 "Metrô"
@@ -29563,9 +29843,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
@@ -29573,5 +29853,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,
@@ -29581,8 +29861,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
@@ -29596,5 +29876,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#. 
+#.
 #: build/trans_style.java:72
 msgid "standard"
@@ -29602,5 +29882,5 @@
 
 #. mappaint style named "standard"
-#. 
+#.
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -29649,6 +29929,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>
@@ -29728,5 +30008,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -29736,16 +30016,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 "depreciado"
@@ -29756,5 +30036,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -29763,5 +30043,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -29770,5 +30050,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -29784,5 +30064,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -29796,5 +30076,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -29803,5 +30083,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -29810,5 +30090,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -29817,5 +30097,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -29824,5 +30104,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -29831,5 +30111,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -29838,5 +30118,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxweight"/>
@@ -29845,5 +30125,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxheight"/>
@@ -29852,5 +30132,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -29859,5 +30139,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxlength"/>
@@ -29866,5 +30146,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -29873,5 +30153,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="minspeed"/>
@@ -29880,5 +30160,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxstay"/>
@@ -29887,5 +30167,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="toll"/>
@@ -29894,5 +30174,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="barrier"/>
@@ -30069,7 +30349,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- highway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -30083,5 +30363,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -30091,7 +30371,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- tracktype tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -30101,5 +30381,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -30109,5 +30389,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -30117,5 +30397,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -30125,10 +30405,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 "trilha_autoestrada"
@@ -30139,5 +30419,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -30146,5 +30426,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -30154,5 +30434,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -30161,5 +30441,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -30168,5 +30448,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -30175,5 +30455,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -30182,5 +30462,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -30189,5 +30469,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -30196,5 +30476,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -30203,5 +30483,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -30210,5 +30490,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -30217,8 +30497,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 "serviços"
@@ -30229,8 +30509,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 "travessia de rio"
@@ -30241,5 +30521,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -30248,8 +30528,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 "rótula"
@@ -30260,9 +30540,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 ""
@@ -30273,9 +30553,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 "margem de rio"
@@ -30286,8 +30566,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 "fluxo"
@@ -30298,8 +30578,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 "doca"
@@ -30310,5 +30590,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -30317,5 +30597,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -30324,5 +30604,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -30332,5 +30612,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -30339,5 +30619,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -30346,5 +30626,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -30353,5 +30633,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -30361,5 +30641,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -30370,5 +30650,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -30378,7 +30658,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--man_made tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -30388,5 +30668,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -30396,5 +30676,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -30404,5 +30684,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -30413,5 +30693,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -30420,5 +30700,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -30428,5 +30708,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -30436,5 +30716,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -30444,5 +30724,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -30452,5 +30732,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -30460,5 +30740,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -30468,5 +30748,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -30476,5 +30756,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -30484,5 +30764,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -30492,18 +30772,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 ""
@@ -30513,9 +30793,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 ""
@@ -30526,7 +30806,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- railway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -30536,5 +30816,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -30543,5 +30823,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -30551,5 +30831,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -30558,5 +30838,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -30566,5 +30846,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -30574,10 +30854,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 "ponto de ferrovia"
@@ -30588,5 +30868,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -30597,13 +30877,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 ""
@@ -30614,5 +30894,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -30622,5 +30902,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30633,5 +30913,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30639,7 +30919,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 ""
@@ -30650,5 +30930,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -30657,5 +30937,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -30664,5 +30944,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -30671,7 +30951,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aeroway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -30682,9 +30962,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 "aerovia"
@@ -30695,8 +30975,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 "terminal"
@@ -30707,5 +30987,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -30715,8 +30995,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 "aerovia_escuro"
@@ -30727,8 +31007,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 "aerovia_claro"
@@ -30739,5 +31019,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -30746,5 +31026,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -30753,7 +31033,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aerialway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -30763,5 +31043,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -30771,5 +31051,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -30779,5 +31059,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -30787,5 +31067,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -30795,10 +31075,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 ""
@@ -30809,11 +31089,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 "pista_fácil"
@@ -30824,9 +31104,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 "pista_intermediária"
@@ -30837,9 +31117,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 "pista_avançada"
@@ -30850,9 +31130,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 ""
@@ -30863,9 +31143,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 "pista_livre"
@@ -30876,9 +31156,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 "pista_novatos"
@@ -30889,7 +31169,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--power tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -30899,5 +31179,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -30906,5 +31186,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -30914,5 +31194,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -30922,5 +31202,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -30930,5 +31210,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -30938,5 +31218,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -30946,5 +31226,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -30954,5 +31234,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -30962,5 +31242,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -30970,5 +31250,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -30978,5 +31258,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -30986,5 +31266,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -30994,15 +31274,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 "energia"
@@ -31012,9 +31292,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 "embarcadouro"
@@ -31025,8 +31305,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 "canalização"
@@ -31036,7 +31316,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--leisure tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -31046,5 +31326,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -31054,5 +31334,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -31062,5 +31342,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -31070,5 +31350,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -31078,5 +31358,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -31086,5 +31366,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -31094,5 +31374,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -31102,5 +31382,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -31110,5 +31390,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -31118,5 +31398,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -31126,5 +31406,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -31134,5 +31414,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -31142,5 +31422,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -31150,5 +31430,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -31158,5 +31438,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -31166,17 +31446,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 "lazer"
@@ -31186,9 +31466,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 "marina"
@@ -31198,7 +31478,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--amenity tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -31208,5 +31488,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -31216,5 +31496,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -31224,5 +31504,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -31232,5 +31512,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -31240,5 +31520,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -31248,5 +31528,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -31256,5 +31536,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -31264,5 +31544,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -31272,5 +31552,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -31280,14 +31560,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 ""
@@ -31297,5 +31577,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -31305,5 +31585,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -31313,5 +31593,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -31321,5 +31601,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -31329,5 +31609,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -31337,5 +31617,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -31345,5 +31625,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -31353,5 +31633,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -31361,5 +31641,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -31369,5 +31649,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -31377,5 +31657,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -31385,14 +31665,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 ""
@@ -31402,5 +31682,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -31409,5 +31689,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -31417,5 +31697,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -31424,5 +31704,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -31432,5 +31712,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -31440,5 +31720,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -31448,5 +31728,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -31455,5 +31735,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -31463,5 +31743,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -31471,5 +31751,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -31479,5 +31759,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -31487,5 +31767,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -31494,5 +31774,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -31501,5 +31781,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -31508,5 +31788,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -31515,5 +31795,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -31522,5 +31802,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -31529,5 +31809,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -31536,5 +31816,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -31543,5 +31823,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -31550,5 +31830,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -31557,5 +31837,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -31564,5 +31844,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -31571,5 +31851,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -31578,5 +31858,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -31586,5 +31866,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -31594,5 +31874,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -31602,5 +31882,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -31610,5 +31890,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -31618,5 +31898,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -31626,5 +31906,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -31634,5 +31914,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -31642,5 +31922,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -31650,5 +31930,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -31659,5 +31939,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -31667,5 +31947,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -31675,5 +31955,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -31683,5 +31963,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -31691,5 +31971,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -31699,5 +31979,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -31707,5 +31987,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -31715,5 +31995,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -31723,5 +32003,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -31731,5 +32011,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -31739,5 +32019,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -31747,5 +32027,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -31755,5 +32035,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -31763,5 +32043,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -31771,5 +32051,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -31779,5 +32059,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"/>
@@ -31787,5 +32075,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -31795,5 +32083,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -31803,5 +32091,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -31811,5 +32099,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -31818,27 +32106,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 ""
@@ -31848,5 +32137,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -31856,5 +32145,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -31864,12 +32153,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 ""
@@ -31879,5 +32168,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -31887,5 +32176,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -31895,5 +32184,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -31903,5 +32192,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -31911,5 +32200,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -31919,5 +32208,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -31927,11 +32216,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 "saúde"
@@ -31941,7 +32230,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--shop tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -31951,5 +32240,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -31959,5 +32248,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -31967,5 +32256,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -31975,5 +32264,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -31983,5 +32272,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -31991,5 +32280,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -31999,5 +32288,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -32007,5 +32296,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -32015,5 +32304,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -32023,5 +32312,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -32031,5 +32320,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -32039,5 +32328,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -32047,5 +32336,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -32055,5 +32344,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -32063,5 +32352,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -32071,5 +32360,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -32079,5 +32368,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -32087,5 +32376,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -32095,5 +32384,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -32103,5 +32392,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -32111,5 +32400,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -32119,5 +32408,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -32127,5 +32416,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -32135,5 +32424,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -32143,5 +32432,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -32151,5 +32440,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -32159,5 +32448,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -32167,5 +32456,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -32175,5 +32464,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -32183,5 +32472,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -32191,5 +32480,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -32199,5 +32488,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -32207,5 +32496,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -32215,5 +32504,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -32223,5 +32512,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -32231,5 +32520,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -32239,5 +32528,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -32247,5 +32536,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -32255,5 +32544,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -32263,5 +32552,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -32271,5 +32560,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -32279,31 +32568,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 "loja"
@@ -32313,7 +32602,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--tourism tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -32323,5 +32612,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -32331,5 +32620,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -32339,5 +32628,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -32347,5 +32636,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -32355,5 +32644,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -32363,5 +32652,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -32371,12 +32660,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 "hotel"
@@ -32386,5 +32675,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -32394,5 +32683,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -32402,5 +32691,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -32410,5 +32699,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -32418,5 +32707,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -32426,5 +32715,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -32435,5 +32724,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -32443,5 +32732,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- information tags -->
 #. <rule>
@@ -32451,5 +32740,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -32459,5 +32748,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -32466,5 +32755,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -32473,13 +32762,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 "turismo"
@@ -32489,7 +32778,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--historic tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -32499,5 +32788,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -32507,5 +32796,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -32515,5 +32804,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -32523,5 +32812,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -32531,5 +32820,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -32539,5 +32828,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -32547,5 +32836,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -32555,5 +32844,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -32563,13 +32852,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 "histórico"
@@ -32579,8 +32868,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 ""
@@ -32591,8 +32880,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 "aterro"
@@ -32603,5 +32892,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -32611,8 +32900,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 ""
@@ -32623,8 +32912,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 "fazenda"
@@ -32635,6 +32924,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
-#. 
+#.
+#.
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -32644,8 +32933,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 "venda"
@@ -32656,8 +32945,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 "industrial"
@@ -32668,8 +32957,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 "Área contaminada"
@@ -32680,8 +32969,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 "campo"
@@ -32692,8 +32981,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 ""
@@ -32704,5 +32993,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -32712,7 +33001,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--military tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -32722,5 +33011,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -32730,5 +33019,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -32738,5 +33027,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -32746,11 +33035,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 "exército"
@@ -32761,8 +33050,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 "Cemitério"
@@ -32772,8 +33061,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 "cume"
@@ -32784,9 +33073,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 "geleira"
@@ -32796,9 +33085,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 "vulcão"
@@ -32808,5 +33097,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -32817,5 +33106,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -32825,5 +33114,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -32833,5 +33122,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -32841,5 +33130,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -32849,12 +33138,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 ""
@@ -32864,9 +33153,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 "arbusto"
@@ -32876,9 +33165,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 ""
@@ -32888,9 +33177,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 ""
@@ -32900,9 +33189,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 "lama"
@@ -32912,9 +33201,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 "praia"
@@ -32925,5 +33214,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?
@@ -32949,5 +33238,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -32958,11 +33247,11 @@
 #. </rule>
 #. -->
-#. 
+#.
 #. <!--name tags -->
-#. 
+#.
 #. <!--preferences tags -->
-#. 
+#.
 #. <!--place tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -32972,5 +33261,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -32980,5 +33269,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -32988,5 +33277,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -32996,5 +33285,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -33004,5 +33293,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -33012,5 +33301,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -33020,5 +33309,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -33028,5 +33317,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -33036,5 +33325,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -33044,5 +33333,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -33052,5 +33341,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -33060,15 +33349,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 "lugar"
@@ -33078,9 +33367,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 ""
@@ -33171,5 +33460,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#. 
+#.
 #. Data type can be:
 #. node        - a node point
@@ -33177,28 +33466,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
@@ -33313,5 +33602,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#. 
+#.
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -33324,5 +33613,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>
@@ -33347,6 +33636,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#. 
-#. 
+#.
+#.
 #. only for Germany
 #: build/trans_wms.java:17
@@ -33355,6 +33644,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#. 
-#. 
+#.
+#.
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -33369,6 +33658,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
@@ -33382,6 +33671,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
@@ -33401,6 +33690,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#. 
-#. 
+#.
+#.
 #. only for Japan
 #: build/trans_wms.java:39
@@ -33424,6 +33713,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
@@ -33436,4 +33725,13 @@
 msgstr "Sicilia - Italia"
 
+#~ 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 ""
+#~ "Objeto alvo com id {0} e versão {1} é visível, porém o source do objeto "
+#~ "com versão menor {2} não é visível. Não é possível lidar com essa "
+#~ "inconsistência. Mantendo objeto alvo. "
+
 #~ msgid "Preparing..."
 #~ msgstr "Preparando..."
@@ -33472,5 +33770,4 @@
 #~ msgstr "Encontrado elemento <member> em non-relation."
 
-#, java-format
 #~ msgid ""
 #~ "Warning - loading of {0} plugin was requested. This plugin is no longer "
@@ -33486,5 +33783,4 @@
 #~ msgstr "Identificação de nó mal-formada"
 
-#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Plugin não encontrado: {0}."
@@ -33500,5 +33796,4 @@
 #~ msgstr "<nd> tem ref zero"
 
-#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Por favor, reporte um erro em {0}"
@@ -33515,9 +33810,9 @@
 
 #~ 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 ""
-#~ "Tente atualizar para a última versão do JOSM e plugins antes de reportar um "
-#~ "bug."
+#~ "Tente atualizar para a última versão do JOSM e plugins antes de reportar "
+#~ "um bug."
 
 #~ msgid "Be sure to include the following information:"
@@ -33527,17 +33822,13 @@
 #~ msgstr "Membro vazio na relação."
 
-#, java-format
 #~ msgid "multipolygon way ''{0}'' is not closed."
 #~ msgstr "via multipolígonos \"{0}\" não está fechada."
 
-#, java-format
 #~ msgid "No useful role ''{0}'' for Way ''{1}''."
 #~ msgstr "Regra não aplicável ''{0}'' para Way ''{1}''."
 
-#, java-format
 #~ msgid "Way ''{0}'' with less than two points."
 #~ msgstr "Way ''{0}'' com menos de dois pontos."
 
-#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -33550,11 +33841,10 @@
 
 #~ 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 ""
-#~ "A ativação dos plugins atualizados falhou. Verifique se o JOSM tem permissão "
-#~ "de sobreescrever os existentes."
-
-#, java-format
+#~ "A ativação dos plugins atualizados falhou. Verifique se o JOSM tem "
+#~ "permissão de sobreescrever os existentes."
+
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr "Pulando uma via porque ela inclui um nó que não existe: {0}\n"
@@ -33564,41 +33854,31 @@
 #~ "Dica: Algumas alterações vieram ao enviar novos dados para o servidor."
 
-#, java-format
 #~ msgid "Unknown role ''{0}''."
 #~ msgstr "Regra desconhecida \"{0}\"."
 
-#, java-format
 #~ msgid "Unknown member type for ''{0}''."
 #~ msgstr "Tipo de membro desconhecido para \"{0}\"."
 
-#, java-format
 #~ msgid "Intersection between ways ''{0}'' and ''{1}''."
 #~ msgstr "Interseção entre as vias \"{0}\" e \"{1}\"."
 
-#, java-format
 #~ msgid "Style for restriction {0} not found."
 #~ msgstr "Estilo para restrição {0} não encontrado."
 
-#, java-format
 #~ msgid "No outer way for multipolygon ''{0}''."
 #~ msgstr "Não há via externa no multipolígono \"{0}\"."
 
-#, java-format
 #~ msgid "Inner way ''{0}'' is outside."
 #~ msgstr "Via interna \"{0}\" está fora."
 
-#, java-format
 #~ msgid "Error: {0}"
 #~ msgstr "Erro: {0}"
 
-#, java-format
 #~ msgid "Warning: {0}"
 #~ msgstr "Aviso: {0}"
 
-#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Não foi possível abrir o diretório de preferências: {0}"
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -33663,9 +33943,7 @@
 #~ msgstr "Baixar Área"
 
-#, java-format
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "Usar preferência ''{0}'' do grupo ''{1}''"
 
-#, java-format
 #~ msgid "Use preset ''{0}''"
 #~ msgstr "Usar preferencia ''{0}''"
@@ -33707,9 +33985,7 @@
 #~ msgstr "Existiram conflitos durante a importação"
 
-#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Editor de relações: {0}"
 
-#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "Autores: {0}"
@@ -33727,5 +34003,4 @@
 #~ msgstr "Combinar conflitos"
 
-#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Pilha de comandos: {0}"
@@ -33752,5 +34027,4 @@
 #~ msgstr "Pode-se editar somente páginas de ajuda online do JOSM"
 
-#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Erro ao carregar página {0}"
@@ -33760,9 +34034,9 @@
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still want "
-#~ "to merge them?"
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
 #~ msgstr ""
-#~ "Os nós selecionados tem relações de usuários diferentes. Você ainda pretende "
-#~ "uni-los?"
+#~ "Os nós selecionados tem relações de usuários diferentes. Você ainda "
+#~ "pretende uni-los?"
 
 #~ msgid "Merge nodes with different memberships?"
@@ -33798,8 +34072,9 @@
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data layer?"
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
 #~ msgstr ""
-#~ "Não foram encontrados dados a atualizar. Você já abriu ou baixou uma camada "
-#~ "de dados?"
+#~ "Não foram encontrados dados a atualizar. Você já abriu ou baixou uma "
+#~ "camada de dados?"
 
 #~ msgid "No data imported."
@@ -33824,5 +34099,4 @@
 #~ msgstr "Faltando número de versão nos dados dos mapas"
 
-#, java-format
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "Não foi possível ler da URL: \"{0}\""
@@ -33834,5 +34108,4 @@
 #~ msgstr "Arquivo não encontrado"
 
-#, java-format
 #~ msgid "Images for {0}"
 #~ msgstr "Imagens para {0}"
@@ -33850,6 +34123,6 @@
 
 #~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this as "
-#~ "a bug."
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
 #~ msgstr ""
 #~ "Erro interno: Não é possível verificar condições sem nenhuma camada. Por "
@@ -33886,5 +34159,4 @@
 #~ msgstr "Envio para API OSM falhou"
 
-#, java-format
 #~ msgid ""
 #~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
@@ -33893,12 +34165,10 @@
 #~ msgstr ""
 #~ "<html>Envio <strong>falhou</strong> porque uma primitiva que você "
-#~ "tentou<br>apagar no servidor já está apagada.<br><br>A mensagem de erro "
-#~ "é:<br>{0}</html>"
-
-#, java-format
+#~ "tentou<br>apagar no servidor já está apagada.<br><br>A mensagem de erro é:"
+#~ "<br>{0}</html>"
+
 #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 #~ msgstr "Cabeçalho de erro \"{0}\" não se encaixa no padrão \"{1}\""
 
-#, java-format
 #~ msgid ""
 #~ "WARNING: launching browser windows for the first {0} of {1} selected "
@@ -33908,5 +34178,4 @@
 #~ "primitivas selecionadas"
 
-#, java-format
 #~ msgid ""
 #~ "Current number of changes exceeds the max. number of changes, current is "
@@ -33917,6 +34186,6 @@
 
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want to "
-#~ "combine them?"
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
 #~ msgstr ""
 #~ "Os caminhos selecionados têm filiações diferentes. Você pretende uni-los "
@@ -33932,18 +34201,17 @@
 #~ msgstr "Extensão de arquivo desconhecida."
 
-#, java-format
 #~ msgid ""
 #~ "<html>There are {0} primitives in your local dataset which<br>might be "
 #~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
-#~ "to check the state of these primitives<br>on the server.<br>Click "
+#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
+#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
 #~ "<strong>{2}</strong> to ignore.<br></html>"
 #~ msgstr ""
-#~ "<html>Existem {0} primitivas no seu conjunto de dados local que<br>podem ter "
-#~ "sido apagadas do servidor. Se você posteriormente tentar exclui-las "
+#~ "<html>Existem {0} primitivas no seu conjunto de dados local que<br>podem "
+#~ "ter sido apagadas do servidor. Se você posteriormente tentar exclui-las "
 #~ "ou<br>atualizá-las no servidor provavelmente o servidor apontará "
-#~ "um<br>conflito.<br><br>Clique <strong>{1}</strong> para verificar o estado "
-#~ "dessas primitivas<br>no servidor.<br>Clique <strong>{2}</strong> para "
-#~ "ignorar.<br></html>"
+#~ "um<br>conflito.<br><br>Clique <strong>{1}</strong> para verificar o "
+#~ "estado dessas primitivas<br>no servidor.<br>Clique <strong>{2}</strong> "
+#~ "para ignorar.<br></html>"
 
 #~ msgid "Failed to initialize API. Please try again later."
@@ -33970,7 +34238,7 @@
 #~ "projection to get rid of this warning.<br>Do you want to continue?"
 #~ msgstr ""
-#~ "<html>Você está usando a projeção EPSG:4326 que pode levar a<br>resultados "
-#~ "indesejados quando fizer alinhamentos retangulares.<br>Mude sua projeção "
-#~ "para evitar esta notificação.<br>Pretende continuar?"
+#~ "<html>Você está usando a projeção EPSG:4326 que pode levar "
+#~ "a<br>resultados indesejados quando fizer alinhamentos retangulares."
+#~ "<br>Mude sua projeção para evitar esta notificação.<br>Pretende continuar?"
 
 #~ msgid "No \"to\" way found."
@@ -33983,5 +34251,4 @@
 #~ msgstr "Mais de um caminho \"para\" encontrado."
 
-#, java-format
 #~ msgid "Style for inner way ''{0}'' equals multipolygon."
 #~ msgstr "Estilo para caminho interno \"{0}\" é multipolígono."
@@ -33990,5 +34257,4 @@
 #~ msgstr "Caminho para Estilo de Área não está fechado."
 
-#, java-format
 #~ msgid "Non-Way ''{0}'' in multipolygon."
 #~ msgstr "\"{0}\" não é um caminho no multipolígono."
@@ -34000,5 +34266,4 @@
 #~ msgstr "Carregar Seleção"
 
-#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "Contato {0}..."
@@ -34007,20 +34272,17 @@
 #~ msgstr "Número de parametros incorreto para operador de nós."
 
-#, java-format
 #~ msgid "Incorrect value of id operator: {0}. Number is expected."
 #~ msgstr "Valor incorreto do operador de id: {0}. Se esperava um número."
 
-#, java-format
 #~ msgid ""
 #~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
 #~ "nodes or range, for example nodes:10-20"
 #~ msgstr ""
-#~ "Valor incorreto de operador de nós: {0}. O operador de nós espera un número "
-#~ "de nós ou um intervalo, por exemplos, os nós:10-20"
+#~ "Valor incorreto de operador de nós: {0}. O operador de nós espera un "
+#~ "número de nós ou um intervalo, por exemplos, os nós:10-20"
 
 #~ msgid "Expected closing parenthesis."
 #~ msgstr "Fechamento de parenteses esperado."
 
-#, java-format
 #~ msgid "Parsing error in URL: \"{0}\""
 #~ msgstr "Erro processando URL: \"{0}\""
@@ -34029,5 +34291,4 @@
 #~ msgstr "Purgando 1 primitiva"
 
-#, java-format
 #~ msgid "removing reference from way {0}"
 #~ msgstr "removendo referência de caminho {0}"
@@ -34051,5 +34312,4 @@
 #~ msgstr "Encontrado mais de um parâmetro \"via\"."
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -34072,6 +34332,6 @@
 #~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
 #~ msgstr ""
-#~ "Não foi possível encontrar primitiva com id {0} e versão {1} no conjunto de "
-#~ "dados"
+#~ "Não foi possível encontrar primitiva com id {0} e versão {1} no conjunto "
+#~ "de dados"
 
 #~ msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
@@ -34079,9 +34339,10 @@
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you load\n"
+#~ "Parameters are read in the order they are specified, so make sure you "
+#~ "load\n"
 #~ "some data before --selection"
 #~ msgstr ""
-#~ "Parâmetros são lidos na ordem em que são informados, por isso tenha certeza "
-#~ "que você está carregando\n"
+#~ "Parâmetros são lidos na ordem em que são informados, por isso tenha "
+#~ "certeza que você está carregando\n"
 #~ "alguma coisa antes de --selection"
 
@@ -34131,7 +34392,4 @@
 #~ msgstr "Continuar assim mesmo"
 
-#~ msgid "Are you sure?"
-#~ msgstr "Você tem certeza?"
-
 #~ msgid "<multiple>"
 #~ msgstr "<múltiplo>"
@@ -34146,9 +34404,7 @@
 #~ msgstr "Conflitos nos dados"
 
-#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} dentro da faixa"
 
-#, java-format
 #~ msgid "The date in file \"{0}\" could not be parsed."
 #~ msgstr "A data no arquivo \"{0}\" não pode ser analisada."
@@ -34178,18 +34434,17 @@
 #~ msgstr "Tipo de Quadro"
 
-#, java-format
 #~ msgid ""
-#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}"
+#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: "
+#~ "{0}"
 #~ msgstr ""
-#~ "Levantada exceção de segurança setAlwaysOnTop(). Ignorando. Exceção foi: {0}"
+#~ "Levantada exceção de segurança setAlwaysOnTop(). Ignorando. Exceção foi: "
+#~ "{0}"
 
 #~ msgid "Linked"
 #~ msgstr "Vinculado"
 
-#, java-format
 #~ msgid "No time for point {0} x {1}"
 #~ msgstr "Sem tempo para ponto {0} x {1}"
 
-#, java-format
 #~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
 #~ msgstr "Não foi possível ler tempo \"{0}\" para ponto {1} x {2}"
@@ -34198,13 +34453,10 @@
 #~ msgstr "Não foram encontradas imagens com dados de tempo legíveis"
 
-#, java-format
 #~ msgid "GPS start: {0}"
 #~ msgstr "Iniciar GPS: {0}"
 
-#, java-format
 #~ msgid "current delta: {0}s"
 #~ msgstr "delta atual: {0}s"
 
-#, java-format
 #~ msgid "GPS end: {0}"
 #~ msgstr "Finalizar GPS: {0}"
@@ -34223,9 +34475,9 @@
 
 #~ msgid ""
-#~ "Enable to upload all changes in one request, disable to use one request per "
-#~ "changed primitive"
+#~ "Enable to upload all changes in one request, disable to use one request "
+#~ "per changed primitive"
 #~ msgstr ""
-#~ "Habilitar para envio de todas modificações em uma chamada, desabilitar para "
-#~ "usar uma chamada por primitiva"
+#~ "Habilitar para envio de todas modificações em uma chamada, desabilitar "
+#~ "para usar uma chamada por primitiva"
 
 #~ msgid "Confirmation"
@@ -34241,36 +34493,30 @@
 #~ msgstr "Gauss-Laborde Réunion 1947"
 
-#, java-format
 #~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Faltando página de Ajuda. Crie uma em <A HREF=\"{0}\">português</A>."
-
-#, java-format
+#~ msgstr ""
+#~ "Faltando página de Ajuda. Crie uma em <A HREF=\"{0}\">português</A>."
+
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
 #~ msgstr ""
-#~ "Página de ajuda. Crie-a em <A HREF=\"{0}\">English</A> ou <A "
-#~ "HREF=\"{1}\">português</A>."
+#~ "Página de ajuda. Crie-a em <A HREF=\"{0}\">English</A> ou <A HREF=\"{1}"
+#~ "\">português</A>."
 
 #~ msgid "Didn't find an primitive with id {0} in this dataset"
 #~ msgstr "Não consegui encontrar um primitivo com o id {0} neste dataset."
 
-#, java-format
 #~ msgid "Parameter ''{0}'' must not be null."
 #~ msgstr "parâmetro ''{0}'' não pode ser nulo"
 
-#, java-format
 #~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 #~ msgstr "se esperava instância de OsmDataLayer ou GpxLayer. Obtido \"{0}\""
 
-#, java-format
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "valor não esperado de retorno. Veio {0}"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
 #~ msgstr "parametro {0} > 0 necessário. Obtido {1}."
 
-#, java-format
 #~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 #~ msgstr "parametro ''{0}'' não é uma classe aceitável, obtido ''{1}''"
@@ -34282,5 +34528,4 @@
 #~ msgstr "Não há versão válida na data ''{0}'' neste histórico"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 #~ msgstr "parâmetro ''{0}'' no intervalo  de 0..{1} esperado, obtido {2}"
@@ -34292,17 +34537,13 @@
 #~ msgstr "não foi encontrada a última versão. Histórico está vazio."
 
-#, java-format
 #~ msgid "Parameter current out of range. Got {0}."
 #~ msgstr "parâmetro atual fora do intervalo: obtido {0}"
 
-#, java-format
 #~ msgid "Unexpected column index. Got {0}."
 #~ msgstr "indice inesperado na coluna. Obtido {0}"
 
-#, java-format
 #~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
 #~ msgstr "O parâmetro 'col' deve ser 0 ou 1. Obtido {0}"
 
-#, java-format
 #~ msgid "Index out of bounds. Got {0}."
 #~ msgstr "índice fora dos limites. Obtido {0}"
@@ -34311,5 +34552,4 @@
 #~ msgstr "Mostrar histórico da primitiva selecionada"
 
-#, java-format
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Não foi possível ler \"{0}\""
@@ -34321,24 +34561,21 @@
 #~ msgstr "Não pode procurar porque não exite informação carregada."
 
-#, java-format
 #~ msgid ""
 #~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
 #~ "relation?</html>"
 #~ msgstr ""
-#~ "<html>Selecção \"{0}\" é usada pela relação \"{1}\".<br>Apagar da "
-#~ "relação?</html>"
-
-#, java-format
+#~ "<html>Selecção \"{0}\" é usada pela relação \"{1}\".<br>Apagar da relação?"
+#~ "</html>"
+
 #~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-#~ "from relation?</html>"
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
 #~ msgstr ""
-#~ "<html>A selecção \"{0}\" é usada pela relação \"{1}\" com o papel "
-#~ "{2}.<br>Apagar da relação?</html>"
+#~ "<html>A selecção \"{0}\" é usada pela relação \"{1}\" com o papel {2}."
+#~ "<br>Apagar da relação?</html>"
 
 #~ msgid "Replace"
 #~ msgstr "Substituir"
 
-#, java-format
 #~ msgid ""
 #~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
@@ -34351,13 +34588,10 @@
 #~ msgstr "Changeset atual é nulo. Não há como enviar os dados."
 
-#, java-format
 #~ msgid "Uploading {0} objects ..."
 #~ msgstr "Enviando {0} objetos..."
 
-#, java-format
 #~ msgid "Id > 0 required, got {0}"
 #~ msgstr "Exige-se Id > 0, obtido {0}"
 
-#, java-format
 #~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
 #~ msgstr "Erro de sintaxe do padrão: padrão {0} em {1} é ilegal!"
@@ -34366,5 +34600,4 @@
 #~ msgstr "Número errado de parâmetros para o operador de tags"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' must not be empty"
 #~ msgstr "O parâmetro \"{0}\" não pode estar vazio"
@@ -34379,27 +34612,25 @@
 #~ "Deseja continuar?"
 
-#, java-format
-#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
+#~ msgid ""
+#~ "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them all?"
+#~ "The selection contains {0} ways. Are you sure you want to simplify them "
+#~ "all?"
 #~ msgstr[0] "A seleção contém {0} via. Tem certeza que quer simplificá-la?"
 #~ msgstr[1] ""
 #~ "A seleção contém {0} vias. Tem certeza que quer simplificar todas?"
 
-#, java-format
 #~ msgid ""
-#~ "Incorrect value of tags operator: {0}. Tags operator expects number of tags "
-#~ "or range, for example tags:1 or tags:2-5"
+#~ "Incorrect value of tags operator: {0}. Tags operator expects number of "
+#~ "tags or range, for example tags:1 or tags:2-5"
 #~ msgstr ""
 #~ "Valor incorreto para operador de etiquetas: {0}. Operador de tags espera "
 #~ "número de etiquetas ou intervalo, por exemplo, tags:1 ou tags:2-5"
 
-#, java-format
 #~ msgid "Incorrect value of changeset operator: {0}. Number is expected."
 #~ msgstr ""
-#~ "Valor incorreto para operador de conjunto de modificações: {0}. Um número é "
-#~ "esperado."
-
-#, java-format
+#~ "Valor incorreto para operador de conjunto de modificações: {0}. Um número "
+#~ "é esperado."
+
 #~ msgid "Incorrect value of version operator: {0}. Number is expected."
 #~ msgstr "Valor incorreto de operador de versão: {0}. Número é esperado."
@@ -34433,8 +34664,7 @@
 #~ "Hold left mousebutton and draw a frame."
 #~ msgstr ""
-#~ "<b>Zoom:</b> Roda do mouse, clique duplo ou Ctrl + Up/Down <b>Mover "
-#~ "mapa:</b> Segure o botão direito do mouse e mova-o ou use as setas do "
-#~ "teclado. <b>Selecionar:</b> Segure o botão esquerdo do mouse e desenhe a "
-#~ "área."
+#~ "<b>Zoom:</b> Roda do mouse, clique duplo ou Ctrl + Up/Down <b>Mover mapa:"
+#~ "</b> Segure o botão direito do mouse e mova-o ou use as setas do teclado. "
+#~ "<b>Selecionar:</b> Segure o botão esquerdo do mouse e desenhe a área."
 
 #~ msgid "Use all their elements"
@@ -34448,11 +34678,11 @@
 
 #~ msgid ""
-#~ "You are about to delete nodes outside of the area you have "
-#~ "downloaded.<br>This can cause problems because other objects (that you don't "
-#~ "see) might use them.<br>Do you really want to delete?"
+#~ "You are about to delete nodes outside of the area you have downloaded."
+#~ "<br>This can cause problems because other objects (that you don't see) "
+#~ "might use them.<br>Do you really want to delete?"
 #~ msgstr ""
-#~ "Você está a ponto de apagar nós fora da área que fez download de dados.<br> "
-#~ "Isto pode causar problemas, já que outros objetos que você não pode ver "
-#~ "podem estar usando estes pontos.<br> Deseja realmente apagar?"
+#~ "Você está a ponto de apagar nós fora da área que fez download de dados."
+#~ "<br> Isto pode causar problemas, já que outros objetos que você não pode "
+#~ "ver podem estar usando estes pontos.<br> Deseja realmente apagar?"
 
 #~ msgctxt "filter"
@@ -34463,5 +34693,4 @@
 #~ msgstr "Pontos GPS"
 
-#, java-format
 #~ msgid "Style for outer way ''{0}'' mismatches."
 #~ msgstr "Estilo para caminho externo \"{0}\" contém erros."
Index: /applications/editors/josm/i18n/po/ro.po
===================================================================
--- /applications/editors/josm/i18n/po/ro.po	(revision 21970)
+++ /applications/editors/josm/i18n/po/ro.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:46+0000\n"
+"POT-Creation-Date: 2010-06-23 22:47+0200\n"
+"PO-Revision-Date: 2010-06-15 17:19+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
 "== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2010-06-15 16:23+0000\n"
+"X-Launchpad-Export-Date: 2010-06-23 20:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: ROMANIA\n"
@@ -27,5 +27,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
@@ -97,5 +97,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
@@ -250,5 +250,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
@@ -271,5 +271,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
@@ -277,6 +277,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
@@ -285,4 +287,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
@@ -322,6 +326,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 ""
 
@@ -345,9 +349,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
@@ -407,4 +411,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
@@ -444,5 +449,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 "Informaţii"
@@ -654,5 +659,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
@@ -667,5 +672,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 "Şterge"
@@ -916,4 +921,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 ""
@@ -924,4 +930,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 ""
@@ -1471,6 +1478,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
@@ -1497,4 +1504,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
@@ -1503,6 +1512,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 "Eroare"
@@ -1616,6 +1625,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 ""
 
@@ -1651,8 +1659,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 ""
@@ -1661,5 +1671,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 ""
@@ -1667,16 +1678,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 ""
@@ -1685,13 +1701,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 ""
@@ -1700,8 +1719,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"
@@ -1711,4 +1732,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)"
@@ -1836,6 +1858,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 ""
 
@@ -1901,9 +1922,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)"
@@ -1920,5 +1941,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
@@ -1982,5 +2003,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 "Nu sunt schimbări de transmis."
@@ -1998,14 +2018,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 ""
@@ -2260,5 +2280,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
@@ -2373,6 +2393,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
@@ -3077,7 +3101,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 ""
 
@@ -3123,11 +3147,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"
@@ -3136,5 +3160,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 #, java-format
 msgid ""
@@ -3143,5 +3167,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}"
@@ -3347,6 +3371,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 ""
 
@@ -3429,5 +3453,5 @@
 #. *
 #. * the decimal format 999.999
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3436,5 +3460,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3443,5 +3467,5 @@
 #. *
 #. * coordinates East/North
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3488,4 +3512,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}"
@@ -3497,29 +3524,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 ""
 
@@ -3598,19 +3619,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 ""
@@ -3619,5 +3640,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 "
@@ -3625,5 +3646,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 ""
@@ -3681,6 +3702,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 ""
 
@@ -3695,5 +3715,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 "selectat"
@@ -3857,6 +3877,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 ""
 
@@ -3927,5 +3946,5 @@
 #. color tiger_data
 #. </rule>
-#. 
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -3935,5 +3954,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -3942,5 +3961,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -3949,5 +3968,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -3956,5 +3975,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -3963,5 +3982,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -3970,9 +3989,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--annotation tags -->
-#. 
+#.
 #. <!--"work in progress" tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="building"/>
@@ -3981,5 +4000,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 ""
@@ -4066,5 +4085,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
@@ -4284,5 +4303,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
@@ -4291,4 +4310,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
@@ -4488,5 +4508,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
@@ -4525,6 +4545,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 ""
 
@@ -4555,5 +4575,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"
@@ -4562,5 +4582,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"
@@ -4569,5 +4589,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"
@@ -4781,6 +4801,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 ""
 
@@ -4860,6 +4879,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 ""
 
@@ -4867,6 +4886,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 ""
 
@@ -4917,6 +4936,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 ""
 
@@ -5133,10 +5152,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"
@@ -5145,10 +5166,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
@@ -5230,4 +5253,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 "nici unul"
@@ -5444,7 +5468,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 ""
 
@@ -5469,6 +5493,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 ""
 
@@ -5514,5 +5537,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
@@ -5589,10 +5612,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 ""
 
@@ -5615,5 +5637,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
@@ -5621,5 +5643,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 "Adaugă"
@@ -5668,5 +5690,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 "Istoric"
@@ -5886,10 +5908,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 ""
@@ -7344,6 +7366,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 ""
 
@@ -7367,8 +7389,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 ""
 
@@ -7488,9 +7510,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."
@@ -7499,23 +7521,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 "<diferit>"
 
-#: ../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 "Schimb valorile?"
 
-#: ../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"
@@ -7524,5 +7546,5 @@
 msgstr[1] ""
 
-#: ../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."
@@ -7531,78 +7553,78 @@
 msgstr[1] ""
 
-#: ../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 "Vă rog selectaţi o cheie"
 
-#: ../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 "Vă rog selectaţi o valoare"
 
-#: ../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 ""
 "Vă rog selectaţi obiectele pentru care doriţi să schimbaţi proprietăţile."
 
-#: ../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 ""
 
-#: ../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 ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Şterge cheia selectată din toate obiectele"
 
-#: ../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 "Adaugă o nouă pereche cheie/valoare tuturor obiectelor"
 
-#: ../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 "Editează valoarea cheii selectata pentru toate obiectele"
 
-#: ../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 ""
@@ -7717,6 +7739,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 ""
 
@@ -7734,6 +7756,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 ""
 
@@ -7888,7 +7910,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 ""
 
@@ -8220,7 +8241,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 ""
 
@@ -8361,6 +8381,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 ""
 
@@ -8370,6 +8390,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 ""
 
@@ -8643,9 +8663,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 ""
 
@@ -8660,8 +8679,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 ""
 
@@ -8907,5 +8925,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 ""
@@ -8913,6 +8931,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 ""
 
@@ -8997,6 +9014,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] ""
@@ -9010,6 +9027,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 "
@@ -9235,5 +9252,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9259,6 +9276,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 ""
 
@@ -9313,6 +9329,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 ""
 
@@ -9366,7 +9382,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 ""
 
@@ -9376,5 +9392,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9392,5 +9408,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..."
@@ -9401,6 +9417,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 ""
 
@@ -9618,7 +9633,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 ""
 
@@ -9644,7 +9659,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 ""
 
@@ -9708,6 +9723,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 ""
 
@@ -9883,6 +9898,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 ""
 
@@ -9946,7 +9961,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 ""
 
@@ -10517,6 +10532,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 ""
 
@@ -10538,8 +10553,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 ""
 
@@ -10659,6 +10674,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 ""
 
@@ -10768,6 +10783,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 ""
 
@@ -10901,8 +10915,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 ""
 
@@ -10985,8 +10999,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 ""
 
@@ -11013,7 +11027,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 ""
 
@@ -11064,5 +11078,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 "Vă rog selectaţi rândul care va fi şters."
@@ -11417,6 +11431,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 ""
 
@@ -11475,6 +11488,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 ""
 
@@ -11546,5 +11558,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 ""
@@ -11564,6 +11576,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>:"
@@ -11688,6 +11699,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 ""
 
@@ -11700,9 +11711,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 ""
 
@@ -12001,6 +12012,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 ""
 
@@ -12011,5 +12022,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 ""
@@ -12019,18 +12030,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 ""
@@ -12039,5 +12050,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 ""
@@ -12046,5 +12057,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 ""
@@ -12053,9 +12064,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 ""
@@ -12164,6 +12175,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 ""
 
@@ -12185,6 +12196,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 ""
 
@@ -12262,6 +12273,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 ""
 
@@ -12277,6 +12287,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 ""
 
@@ -12370,6 +12379,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 ""
 
@@ -12503,4 +12512,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 "Modificare proprietăţi"
@@ -12666,5 +12676,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
@@ -12684,5 +12694,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}''"
@@ -12845,6 +12855,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 ""
 
@@ -12961,10 +12970,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 ""
@@ -12972,69 +12981,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}."
@@ -13212,4 +13221,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})"
@@ -13229,6 +13239,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 ""
 
@@ -13256,6 +13266,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 ""
 
@@ -13297,6 +13307,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 ""
 
@@ -13730,6 +13739,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 ""
 
@@ -13935,6 +13944,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 ""
 
@@ -14001,5 +14009,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"
@@ -14082,6 +14090,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 ""
 
@@ -14089,7 +14097,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 ""
 
@@ -14097,7 +14105,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 ""
 
@@ -14105,8 +14113,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 ""
 
@@ -14126,7 +14134,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 ""
 
@@ -14195,7 +14203,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 ""
 
@@ -14207,7 +14214,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 ""
 
@@ -14239,6 +14246,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 ""
 
@@ -14738,6 +14745,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>"
@@ -14764,6 +14771,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"
@@ -14801,6 +14808,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"
@@ -14816,7 +14823,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"
@@ -14867,9 +14874,26 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:134
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+msgid "Big buildings mode"
+msgstr ""
+
+#: ../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 "Opţiuni hartă"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+msgid "Building tag:"
+msgstr ""
+
+#: ../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"
@@ -14878,35 +14902,43 @@
 #: ../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
+msgid "Auto-select building"
+msgstr ""
+
+#: ../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 ""
 
@@ -15081,7 +15113,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--waterway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15091,5 +15123,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15099,5 +15131,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15113,5 +15145,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15121,5 +15153,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15127,8 +15159,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 ""
@@ -15150,5 +15182,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15157,5 +15189,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15164,5 +15196,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15171,5 +15203,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15178,5 +15210,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15185,10 +15217,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 ""
@@ -15217,11 +15249,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 ""
 
@@ -15647,6 +15678,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 ""
@@ -15829,4 +15860,49 @@
 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 "Editare"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#, fuzzy
+msgid "Name:"
+msgstr "Nume"
+
+#: ../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
+#, fuzzy, java-format
+msgid "Delete tool \"{0}\"?"
+msgstr "Șterge {0} cale"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:74
+msgid "Are you sure?"
+msgstr ""
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
+msgid "New tool..."
+msgstr ""
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
+msgid "Install"
+msgstr ""
+
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
 msgid "Position only"
@@ -16093,5 +16169,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#. 
+#.
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16212,6 +16288,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 ""
 
@@ -16230,7 +16305,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 ""
 
@@ -16537,6 +16611,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 ""
 
@@ -16646,6 +16719,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 ""
 
@@ -16696,6 +16768,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 ""
 
@@ -17059,5 +17130,5 @@
 msgstr "Anulează"
 
-#: ../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}"
@@ -17107,4 +17178,40 @@
 #, java-format
 msgid "Revert changeset #{0}"
+msgstr ""
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:78
+msgid "Road Sign Plugin"
+msgstr ""
+
+#: ../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
+#, java-format
+msgid "Could not read tagging preset source: ''{0}''"
+msgstr ""
+
+#: ../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 "Versiune {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:111
+#, java-format
+msgid "Additional sign {0}"
 msgstr ""
 
@@ -17212,4 +17319,13 @@
 msgstr ""
 
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+msgid "Simplify Area"
+msgstr ""
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
+msgid "Delete unnecessary nodes from an area."
+msgstr ""
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
 msgid "Slippy Map"
@@ -18001,6 +18117,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 ""
 
@@ -18086,8 +18202,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 ""
 
@@ -18141,8 +18257,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 ""
 
@@ -18254,6 +18370,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 ""
 
@@ -18261,6 +18377,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 ""
 
@@ -18908,7 +19024,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 ""
 
@@ -19104,9 +19219,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 ""
@@ -19202,11 +19317,137 @@
 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
+#, fuzzy, java-format
+msgid "{0} {1}% of GPS track"
+msgstr "{0} este format din {1} urmă"
+
+#: ../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 "Importă imagini"
+
+#: ../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 "Elimină"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
+msgid "removes current video from layer"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
+msgid "play/pause"
+msgstr ""
+
+#: ../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 "fundal"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
+msgid "jumps n sec back"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+msgid "forward"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+msgid "jumps n sec forward"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
+#, fuzzy
+msgid "faster"
+msgstr "fals"
+
+#: ../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
+msgid "slower"
+msgstr ""
+
+#: ../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
+msgid "loops n sec around current position"
+msgstr ""
+
+#. 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 "strat"
+
+#: ../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 ""
 
@@ -19419,28 +19660,28 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
 msgid "Automatic downloading"
 msgstr ""
 
-#: ../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 ""
@@ -19451,113 +19692,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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
 msgid "Save WMS layer"
 msgstr "Salvează strat WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413
 msgid "Load WMS layer from file"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
 msgid "WMS Plugin Preferences"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -19573,4 +19814,8 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
 msgid "% of north:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186
+msgid "Simultaneous connections"
 msgstr ""
 
@@ -19583,7 +19828,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
@@ -19631,8 +19876,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 ""
@@ -19649,7 +19894,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--boundary tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -19659,5 +19904,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -19700,5 +19945,5 @@
 #. color boundary
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -19708,5 +19953,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -19716,5 +19961,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -19724,15 +19969,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 ""
@@ -19748,5 +19993,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -19755,7 +20000,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--route tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -19765,5 +20010,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -19773,5 +20018,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -19781,5 +20026,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -19789,5 +20034,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -19797,5 +20042,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -19805,5 +20050,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -19813,12 +20058,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 ""
@@ -20095,21 +20340,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 "
@@ -20119,10 +20363,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."
@@ -20130,5 +20374,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 "
@@ -20138,15 +20382,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 "
@@ -20155,5 +20399,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 "
@@ -20163,15 +20407,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"
@@ -20179,5 +20423,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."
@@ -20185,5 +20429,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 "
@@ -20192,5 +20436,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 "
@@ -20199,10 +20443,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."
@@ -20210,15 +20454,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 "
@@ -20227,10 +20472,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 "
@@ -20239,15 +20491,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 "
@@ -20257,10 +20509,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). "
@@ -20269,5 +20521,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) "
@@ -20276,5 +20528,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:89
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20283,10 +20535,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 "
@@ -20295,5 +20547,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 "
@@ -20303,5 +20555,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:97
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20310,15 +20562,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 "
@@ -20327,5 +20579,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:105
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21215,10 +21467,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 ""
@@ -21355,8 +21607,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"/>
@@ -21566,5 +21818,5 @@
 #. color motorroad
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21574,5 +21826,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21591,5 +21843,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21599,5 +21851,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21616,5 +21868,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -21624,5 +21876,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -21641,5 +21893,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -21649,5 +21901,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -21662,5 +21914,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -21678,8 +21930,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 ""
@@ -21694,5 +21946,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -21701,5 +21953,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--public_transport tags -->
 #. <rule>
@@ -21709,10 +21961,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 ""
@@ -21727,5 +21979,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -21734,5 +21986,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -21742,10 +21994,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 ""
@@ -22751,9 +23003,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 ""
@@ -23083,5 +23335,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -23091,5 +23343,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -23099,5 +23351,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -23107,5 +23359,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -23115,5 +23367,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -23123,5 +23375,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -23131,5 +23383,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -23140,5 +23392,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -23146,9 +23398,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 ""
@@ -24558,5 +24810,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24566,5 +24818,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24574,5 +24826,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24582,5 +24834,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -24944,7 +25196,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--sport tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -24954,5 +25206,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -24962,5 +25214,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -24970,5 +25222,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -24978,5 +25230,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -24986,5 +25238,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -24994,5 +25246,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -25002,5 +25254,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -25010,5 +25262,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -25018,5 +25270,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -25026,5 +25278,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -25034,5 +25286,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -25042,5 +25294,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -25050,5 +25302,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -25058,5 +25310,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -25066,5 +25318,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -25074,5 +25326,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -25082,5 +25334,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -25090,5 +25342,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -25098,5 +25350,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -25106,5 +25358,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -25114,5 +25366,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -25122,5 +25374,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -25130,5 +25382,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -25138,5 +25390,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -25146,5 +25398,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -25154,5 +25406,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -25162,5 +25414,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -25170,5 +25422,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -25178,5 +25430,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -25186,5 +25438,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -25194,5 +25446,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -25202,5 +25454,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -25210,5 +25462,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -25218,5 +25470,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -25226,5 +25478,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -25234,5 +25486,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -25242,5 +25494,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -25250,5 +25502,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -25258,5 +25510,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -25266,5 +25518,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -25274,5 +25526,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -25282,5 +25534,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -25290,5 +25542,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -25298,5 +25550,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -25306,5 +25558,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -25314,33 +25566,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 ""
@@ -27018,7 +27270,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--landuse tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -27028,5 +27280,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -27036,5 +27288,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -27044,5 +27296,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -27052,5 +27304,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -27060,5 +27312,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -27068,5 +27320,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -27076,5 +27328,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -27084,12 +27336,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 ""
@@ -28505,5 +28757,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -28519,5 +28771,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28527,18 +28779,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 -->
@@ -28547,7 +28816,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- cycleway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28557,5 +28826,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28565,5 +28834,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28573,5 +28842,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28581,12 +28850,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 ""
@@ -28613,5 +28883,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -28627,5 +28897,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -28635,5 +28905,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28642,13 +28912,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"/>
@@ -28659,11 +28937,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 ""
@@ -28682,8 +28961,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 ""
@@ -28795,9 +29074,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
@@ -28805,5 +29084,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,
@@ -28813,8 +29092,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
@@ -28828,5 +29107,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#. 
+#.
 #: build/trans_style.java:72
 msgid "standard"
@@ -28834,5 +29113,5 @@
 
 #. mappaint style named "standard"
-#. 
+#.
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -28881,6 +29160,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>
@@ -28960,5 +29239,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -28968,16 +29247,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 ""
@@ -28988,5 +29267,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -28995,5 +29274,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -29002,5 +29281,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -29016,5 +29295,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -29028,5 +29307,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -29035,5 +29314,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -29042,5 +29321,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -29049,5 +29328,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -29056,5 +29335,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -29063,5 +29342,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -29070,5 +29349,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxweight"/>
@@ -29077,5 +29356,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxheight"/>
@@ -29084,5 +29363,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -29091,5 +29370,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxlength"/>
@@ -29098,5 +29377,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -29105,5 +29384,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="minspeed"/>
@@ -29112,5 +29391,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxstay"/>
@@ -29119,5 +29398,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="toll"/>
@@ -29126,5 +29405,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="barrier"/>
@@ -29301,7 +29580,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- highway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -29315,5 +29594,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -29323,7 +29602,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- tracktype tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -29333,5 +29612,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -29341,5 +29620,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -29349,5 +29628,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -29357,10 +29636,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 ""
@@ -29371,5 +29650,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -29378,5 +29657,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -29386,5 +29665,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -29393,5 +29672,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -29400,5 +29679,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -29407,5 +29686,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -29414,5 +29693,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -29421,5 +29700,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -29428,5 +29707,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -29435,5 +29714,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -29442,5 +29721,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -29449,8 +29728,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 ""
@@ -29461,8 +29740,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 ""
@@ -29473,5 +29752,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -29480,8 +29759,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 ""
@@ -29492,9 +29771,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 ""
@@ -29505,9 +29784,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 ""
@@ -29518,8 +29797,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 ""
@@ -29530,8 +29809,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 ""
@@ -29542,5 +29821,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29549,5 +29828,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29556,5 +29835,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29564,5 +29843,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29571,5 +29850,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29578,5 +29857,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29585,5 +29864,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29593,5 +29872,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29602,5 +29881,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -29610,7 +29889,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--man_made tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -29620,5 +29899,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -29628,5 +29907,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -29636,5 +29915,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -29645,5 +29924,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -29652,5 +29931,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -29660,5 +29939,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -29668,5 +29947,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -29676,5 +29955,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -29684,5 +29963,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -29692,5 +29971,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -29700,5 +29979,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -29708,5 +29987,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -29716,5 +29995,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -29724,18 +30003,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 ""
@@ -29745,9 +30024,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 ""
@@ -29758,7 +30037,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- railway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -29768,5 +30047,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -29775,5 +30054,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -29783,5 +30062,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -29790,5 +30069,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -29798,5 +30077,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -29806,10 +30085,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 ""
@@ -29820,5 +30099,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -29829,13 +30108,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 ""
@@ -29846,5 +30125,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -29854,5 +30133,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29865,5 +30144,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29871,7 +30150,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 ""
@@ -29882,5 +30161,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -29889,5 +30168,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -29896,5 +30175,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -29903,7 +30182,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aeroway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -29914,9 +30193,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 ""
@@ -29927,8 +30206,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 ""
@@ -29939,5 +30218,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -29947,8 +30226,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 ""
@@ -29959,8 +30238,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 ""
@@ -29971,5 +30250,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -29978,5 +30257,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -29985,7 +30264,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aerialway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -29995,5 +30274,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -30003,5 +30282,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -30011,5 +30290,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -30019,5 +30298,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -30027,10 +30306,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 ""
@@ -30041,11 +30320,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 ""
@@ -30056,9 +30335,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 ""
@@ -30069,9 +30348,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 ""
@@ -30082,9 +30361,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 ""
@@ -30095,9 +30374,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 ""
@@ -30108,9 +30387,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 ""
@@ -30121,7 +30400,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--power tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -30131,5 +30410,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -30138,5 +30417,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -30146,5 +30425,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -30154,5 +30433,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -30162,5 +30441,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -30170,5 +30449,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -30178,5 +30457,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -30186,5 +30465,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -30194,5 +30473,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -30202,5 +30481,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -30210,5 +30489,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -30218,5 +30497,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -30226,15 +30505,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 ""
@@ -30244,9 +30523,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 ""
@@ -30257,8 +30536,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 ""
@@ -30268,7 +30547,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--leisure tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -30278,5 +30557,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -30286,5 +30565,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -30294,5 +30573,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -30302,5 +30581,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -30310,5 +30589,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -30318,5 +30597,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -30326,5 +30605,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -30334,5 +30613,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -30342,5 +30621,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -30350,5 +30629,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -30358,5 +30637,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -30366,5 +30645,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -30374,5 +30653,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -30382,5 +30661,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -30390,5 +30669,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -30398,17 +30677,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 ""
@@ -30418,9 +30697,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 ""
@@ -30430,7 +30709,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--amenity tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -30440,5 +30719,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -30448,5 +30727,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -30456,5 +30735,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -30464,5 +30743,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -30472,5 +30751,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -30480,5 +30759,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -30488,5 +30767,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -30496,5 +30775,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -30504,5 +30783,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -30512,14 +30791,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 ""
@@ -30529,5 +30808,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30537,5 +30816,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30545,5 +30824,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30553,5 +30832,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30561,5 +30840,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30569,5 +30848,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30577,5 +30856,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30585,5 +30864,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30593,5 +30872,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30601,5 +30880,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -30609,5 +30888,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -30617,14 +30896,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 ""
@@ -30634,5 +30913,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -30641,5 +30920,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -30649,5 +30928,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -30656,5 +30935,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -30664,5 +30943,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -30672,5 +30951,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -30680,5 +30959,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -30687,5 +30966,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -30695,5 +30974,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -30703,5 +30982,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -30711,5 +30990,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -30719,5 +30998,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -30726,5 +31005,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -30733,5 +31012,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -30740,5 +31019,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -30747,5 +31026,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -30754,5 +31033,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -30761,5 +31040,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -30768,5 +31047,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -30775,5 +31054,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -30782,5 +31061,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -30789,5 +31068,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -30796,5 +31075,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -30803,5 +31082,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -30810,5 +31089,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -30818,5 +31097,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -30826,5 +31105,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -30834,5 +31113,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -30842,5 +31121,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -30850,5 +31129,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -30858,5 +31137,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -30866,5 +31145,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -30874,5 +31153,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -30882,5 +31161,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -30891,5 +31170,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -30899,5 +31178,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -30907,5 +31186,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -30915,5 +31194,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -30923,5 +31202,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -30931,5 +31210,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -30939,5 +31218,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -30947,5 +31226,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -30955,5 +31234,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -30963,5 +31242,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -30971,5 +31250,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -30979,5 +31258,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -30987,5 +31266,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -30995,5 +31274,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -31003,5 +31282,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -31011,5 +31290,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"/>
@@ -31019,5 +31306,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -31027,5 +31314,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -31035,5 +31322,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -31043,5 +31330,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -31050,27 +31337,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 ""
@@ -31080,5 +31368,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -31088,5 +31376,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -31096,12 +31384,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 ""
@@ -31111,5 +31399,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -31119,5 +31407,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -31127,5 +31415,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -31135,5 +31423,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -31143,5 +31431,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -31151,5 +31439,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -31159,11 +31447,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 ""
@@ -31173,7 +31461,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--shop tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -31183,5 +31471,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -31191,5 +31479,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -31199,5 +31487,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -31207,5 +31495,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -31215,5 +31503,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -31223,5 +31511,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -31231,5 +31519,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -31239,5 +31527,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -31247,5 +31535,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -31255,5 +31543,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -31263,5 +31551,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -31271,5 +31559,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -31279,5 +31567,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -31287,5 +31575,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -31295,5 +31583,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -31303,5 +31591,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -31311,5 +31599,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -31319,5 +31607,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -31327,5 +31615,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -31335,5 +31623,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -31343,5 +31631,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -31351,5 +31639,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -31359,5 +31647,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -31367,5 +31655,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -31375,5 +31663,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -31383,5 +31671,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -31391,5 +31679,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -31399,5 +31687,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -31407,5 +31695,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -31415,5 +31703,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -31423,5 +31711,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -31431,5 +31719,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -31439,5 +31727,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -31447,5 +31735,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -31455,5 +31743,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -31463,5 +31751,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -31471,5 +31759,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -31479,5 +31767,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -31487,5 +31775,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -31495,5 +31783,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -31503,5 +31791,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -31511,31 +31799,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 ""
@@ -31545,7 +31833,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--tourism tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31555,5 +31843,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31563,5 +31851,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31571,5 +31859,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31579,5 +31867,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31587,5 +31875,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31595,5 +31883,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31603,12 +31891,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 ""
@@ -31618,5 +31906,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -31626,5 +31914,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -31634,5 +31922,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -31642,5 +31930,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -31650,5 +31938,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -31658,5 +31946,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -31667,5 +31955,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -31675,5 +31963,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- information tags -->
 #. <rule>
@@ -31683,5 +31971,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -31691,5 +31979,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -31698,5 +31986,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -31705,13 +31993,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 ""
@@ -31721,7 +32009,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--historic tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -31731,5 +32019,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -31739,5 +32027,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -31747,5 +32035,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -31755,5 +32043,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -31763,5 +32051,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -31771,5 +32059,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -31779,5 +32067,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -31787,5 +32075,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -31795,13 +32083,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 ""
@@ -31811,8 +32099,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 ""
@@ -31823,8 +32111,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 ""
@@ -31835,5 +32123,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -31843,8 +32131,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 ""
@@ -31855,8 +32143,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 ""
@@ -31867,6 +32155,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
-#. 
+#.
+#.
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -31876,8 +32164,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 ""
@@ -31888,8 +32176,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 ""
@@ -31900,8 +32188,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 ""
@@ -31912,8 +32200,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 ""
@@ -31924,8 +32212,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 ""
@@ -31936,5 +32224,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -31944,7 +32232,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--military tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -31954,5 +32242,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -31962,5 +32250,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -31970,5 +32258,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -31978,11 +32266,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 ""
@@ -31993,8 +32281,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 ""
@@ -32004,8 +32292,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 ""
@@ -32016,9 +32304,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 ""
@@ -32028,9 +32316,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 ""
@@ -32040,5 +32328,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -32049,5 +32337,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -32057,5 +32345,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -32065,5 +32353,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -32073,5 +32361,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -32081,12 +32369,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 ""
@@ -32096,9 +32384,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 ""
@@ -32108,9 +32396,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 ""
@@ -32120,9 +32408,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 ""
@@ -32132,9 +32420,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 ""
@@ -32144,9 +32432,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 ""
@@ -32157,5 +32445,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?
@@ -32181,5 +32469,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -32190,11 +32478,11 @@
 #. </rule>
 #. -->
-#. 
+#.
 #. <!--name tags -->
-#. 
+#.
 #. <!--preferences tags -->
-#. 
+#.
 #. <!--place tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -32204,5 +32492,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -32212,5 +32500,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -32220,5 +32508,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -32228,5 +32516,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -32236,5 +32524,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -32244,5 +32532,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -32252,5 +32540,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -32260,5 +32548,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -32268,5 +32556,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -32276,5 +32564,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -32284,5 +32572,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -32292,15 +32580,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 ""
@@ -32310,9 +32598,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 ""
@@ -32403,5 +32691,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#. 
+#.
 #. Data type can be:
 #. node        - a node point
@@ -32409,28 +32697,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
@@ -32545,5 +32833,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#. 
+#.
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32556,5 +32844,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>
@@ -32579,6 +32867,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#. 
-#. 
+#.
+#.
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32587,6 +32875,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#. 
-#. 
+#.
+#.
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32601,6 +32889,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
@@ -32614,6 +32902,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
@@ -32633,6 +32921,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#. 
-#. 
+#.
+#.
 #. only for Japan
 #: build/trans_wms.java:39
@@ -32656,6 +32944,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
@@ -32684,11 +32972,10 @@
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version selected "
-#~ "in the history list."
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
 #~ msgstr ""
-#~ "Readu toate obiectele selectate curent la starea din versiunea selectată în "
-#~ "lista de istoric."
-
-#, java-format
+#~ "Readu toate obiectele selectate curent la starea din versiunea selectată "
+#~ "în lista de istoric."
+
 #~ msgid "Contact {0}..."
 #~ msgstr "Contactez {0}..."
@@ -32700,9 +32987,7 @@
 #~ msgstr "Strat de date"
 
-#, java-format
 #~ msgid "No time for point {0} x {1}"
 #~ msgstr "Nu există timp pentru punctul {0} x {1}"
 
-#, java-format
 #~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
 #~ msgstr "Nu pot citi timpul \"{0}\" din punctul {1} x {2}"
@@ -32711,17 +32996,13 @@
 #~ msgstr "Nu am găsit imagini cu mărci de timp citibile."
 
-#, java-format
 #~ msgid "GPS start: {0}"
 #~ msgstr "Start GPS: {0}"
 
-#, java-format
 #~ msgid "GPS end: {0}"
 #~ msgstr "Sfârşit GPS: {0}"
 
-#, java-format
 #~ msgid "current delta: {0}s"
 #~ msgstr "diferentă curentă: {0}s"
 
-#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} în urmă."
@@ -32730,9 +33011,7 @@
 #~ msgstr "Sincronizare ceas"
 
-#, java-format
 #~ msgid "The date in file \"{0}\" could not be parsed."
 #~ msgstr "Datele din fişierul \"{0}\" nu au putut fi interpretate."
 
-#, java-format
 #~ msgid "There is no EXIF time within the file \"{0}\"."
 #~ msgstr "Nu există timp EXIF în fişierul \"{0}\"."
@@ -32759,9 +33038,10 @@
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you load\n"
+#~ "Parameters are read in the order they are specified, so make sure you "
+#~ "load\n"
 #~ "some data before --selection"
 #~ msgstr ""
-#~ "Parametrii sunt citiţi în ordinea în care sunt specificaţi, deci asiguraţi-"
-#~ "vă\n"
+#~ "Parametrii sunt citiţi în ordinea în care sunt specificaţi, deci "
+#~ "asiguraţi-vă\n"
 #~ "că aţi încărcat date înainte de --selection"
 
@@ -32775,7 +33055,4 @@
 #~ msgstr "versiunea lor:"
 
-#~ msgid "false"
-#~ msgstr "fals"
-
 #~ msgid "different"
 #~ msgstr "diferit"
@@ -32796,5 +33073,4 @@
 #~ msgstr "Extensie fişier necunoscută."
 
-#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Modulul nu a fost găsit: {0}."
@@ -32806,5 +33082,4 @@
 #~ msgstr[2] "de imagini"
 
-#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
Index: /applications/editors/josm/i18n/po/ru.po
===================================================================
--- /applications/editors/josm/i18n/po/ru.po	(revision 21970)
+++ /applications/editors/josm/i18n/po/ru.po	(revision 21971)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-15 18:25+0200\n"
-"PO-Revision-Date: 2010-06-15 06:50+0000\n"
-"Last-Translator: Calibrator <Unknown>\n"
+"POT-Creation-Date: 2010-06-23 22:47+0200\n"
+"PO-Revision-Date: 2010-06-20 17:55+0000\n"
+"Last-Translator: Zh <Unknown>\n"
 "Language-Team: Koptev Oleg <koptev.oleg@gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-06-15 16:21+0000\n"
+"X-Launchpad-Export-Date: 2010-06-23 20:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
@@ -26,5 +26,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
@@ -96,5 +96,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
@@ -256,5 +256,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
@@ -277,5 +277,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
@@ -283,6 +283,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
@@ -291,4 +293,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
@@ -415,4 +419,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
@@ -452,5 +457,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 "Информация"
@@ -496,9 +501,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37
 msgid "previous"
-msgstr "предыдущий"
+msgstr "предыдущего"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38
 msgid "next"
-msgstr "следующий"
+msgstr "следующего"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
@@ -664,5 +669,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
@@ -677,5 +682,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 "Удалить"
@@ -926,4 +931,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 ""
@@ -935,4 +941,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 "Это может привести к случайному удалению точек."
@@ -1517,6 +1524,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
@@ -1543,4 +1550,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
@@ -1549,6 +1558,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 "Ошибка"
@@ -1700,8 +1709,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 "Удалить точки за пределами области скачанных с сервера данных"
@@ -1710,5 +1721,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 "Нет, прервать"
@@ -1716,16 +1728,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 "Выберите хотя бы одну линию для упрощения."
@@ -1734,13 +1751,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 ""
@@ -1749,8 +1769,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"
@@ -1761,4 +1783,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)"
@@ -2060,5 +2083,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 "Нет изменений для загрузки на сервер."
@@ -2076,14 +2098,14 @@
 msgstr "Передать на сервер OSM все изменения в выбранном."
 
-#: ../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 "Чтение родителей для ''{0}''"
 
-#: ../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 "Проверка на удалённых родителей в локальном наборе данных"
@@ -2359,5 +2381,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
@@ -3040,10 +3062,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
@@ -3170,5 +3196,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
@@ -3272,4 +3298,6 @@
 "because you don't see the real object.<br>Do you really want to delete?"
 msgstr ""
+"Вы удаляете неполные объекты.<br>Это может привести к проблемам, потому что "
+"вы не видите сам объект.<br>Вы действительно хотите его удалить?"
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:42
@@ -3301,11 +3329,11 @@
 msgstr[2] "Переместить {0} точек"
 
-#: ../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 "Очищеный объект ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111
 #, java-format
 msgid "Purged {0} object"
@@ -3315,5 +3343,5 @@
 msgstr[2] "Очищено {0} объектов"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 #, java-format
 msgid ""
@@ -3324,5 +3352,5 @@
 "Текущее значение {1}"
 
-#: ../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}"
@@ -3703,4 +3731,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}"
@@ -3712,33 +3743,24 @@
 msgstr "Отстутствует результат слияния для объекта с id {0}"
 
-#: ../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 "Отстутствует результат слияния для точки с id {0}"
 
-#: ../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 "Отстутствует результат слияния для отношения с id {0}"
 
-#: ../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 "Отсутствует результат слияния типа {0} с id {1}"
-
-#. 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 ""
-"Полученный объект с id {0} и версией {1} видимый, хотя оригинал с более "
-"низкой версией {2} не видимый. Это несоответствие невозможно. Полученный "
-"объект сохранён. "
 
 #. translators notes must be in front
@@ -3817,19 +3839,19 @@
 "</p><p>Закройте диалог фильтра, если хотите увидеть все объекты.<p></html>"
 
-#: ../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 "Элемент с id=0 не может быть невидимым"
 
-#: ../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 "обнаружено id > 0. Получено {0}"
 
-#: ../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 "обнаружена версия > 0. Получено {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:795
 #, java-format
 msgid ""
@@ -3840,5 +3862,5 @@
 "- {0}"
 
-#: ../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 "
@@ -3846,5 +3868,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 ""
@@ -3919,5 +3941,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 "выделено"
@@ -4208,5 +4230,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 "здание"
@@ -4294,5 +4316,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
@@ -4529,5 +4551,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
@@ -4536,4 +4558,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
@@ -4742,5 +4765,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
@@ -5450,10 +5473,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"
@@ -5462,10 +5487,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
@@ -5549,4 +5576,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 "ничего"
@@ -5857,5 +5885,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
@@ -5960,5 +5988,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
@@ -5966,5 +5994,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 "Добавить"
@@ -6013,5 +6041,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 "Журнал"
@@ -6231,10 +6259,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 "Выбрать отношение в списке отношений."
@@ -7898,9 +7926,9 @@
 msgstr "Неправильная URL запроса пакета правок"
 
-#: ../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."
@@ -7910,23 +7938,23 @@
 msgstr[2] "Это изменит {0} объектов."
 
-#: ../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 "<различные>"
 
-#: ../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 "Изменить значения?"
 
-#: ../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"
@@ -7936,5 +7964,5 @@
 msgstr[2] "Изменить параметры {0} объектов"
 
-#: ../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."
@@ -7944,77 +7972,77 @@
 msgstr[2] "Это изменит до {0} объектов."
 
-#: ../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 "Пожалуйста, выберите ключ"
 
-#: ../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 "Выберите значение"
 
-#: ../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 "Параметры/Участники"
 
-#: ../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 "Параметры выделенных объектов."
 
 #. 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 "Свойств: {0} / Участников: {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 "Параметры / Участники"
 
-#: ../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 "Изменить отношение"
 
-#: ../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 "Вы действительно хотите удалить отмеченное из отношения {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 "Удалить выделенный ключ из всех объектов"
 
-#: ../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 "Добавить новую пару ключ/значение для всех объектов"
 
-#: ../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 "Изменить значение выбранного ключа для всех объектов"
 
-#: ../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 "Выберите отношение в основном выборе."
@@ -8428,5 +8456,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:388
 msgid "Zoom to"
-msgstr "Задать масштаб"
+msgstr "Приблизить"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
@@ -9452,5 +9480,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 "Нет"
@@ -10026,5 +10054,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..."
@@ -10083,5 +10111,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131
 msgid "Upload data in chunks of objects. Chunk size: "
-msgstr "Upload data in chunks of objects. Chunk size: "
+msgstr "Передать данные по частям. Размер части: "
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158
@@ -11894,5 +11922,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 "Пожалуйста, выберите ряд для удаления."
@@ -12403,5 +12431,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 "Использовать настройки по умолчанию"
@@ -12904,5 +12932,5 @@
 "''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #, java-format
 msgid ""
@@ -12910,12 +12938,14 @@
 "Do you want to keep it?"
 msgstr ""
+"Не удаётся прочитать источник заготовок тегов: {0}\n"
+"Вы хотите сохранить его?"
 
 #. 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
+msgstr "Не удаётся прочитать источник заготовок тегов {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
 #, java-format
 msgid ""
@@ -12924,6 +12954,9 @@
 "table></html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:91
+"<html>Источник заготовок тегов {0} может быть загружен, но он содержит "
+"ошибки. Вы действительно хотите использовать его?<br><br><table "
+"width=600>Сообщение об ошибке: [{1}:{2}] {3}</table></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
 #, java-format
 msgid ""
@@ -12931,6 +12964,9 @@
 "it?<br><br><table width=400>Error is: [{1}:{2}] {3}</table></html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
+"<html>Разборка источника заготовок тегов не удалась: {0}. Вы всё равно "
+"хотите воспользоваться им?<br><br><table width=400>Сообщение об ошибке: [{1}:"
+"{2}] {3}</table></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
 #, java-format
 msgid ""
@@ -12938,6 +12974,9 @@
 "really want to use it?<br><br><table width=600>Error is: {1}</table></html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:101
+"<html>Источник заготовок тегов {0} может быть скачан, но содержит ошибки. Вы "
+"всё равно хотите воспользоваться им?<br><br><table width=600>Сообщение об "
+"ошибке: {1}</table></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
 #, java-format
 msgid ""
@@ -12945,10 +12984,13 @@
 "it?<br><br><table width=600>Error is: {1}</table></html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:133
+"<html>Разборка источника заготовок тегов не удалась: {0}. Вы всё равно "
+"хотите воспользоваться им?<br><br><table width=600>Сообщение об ошибке: {1}</"
+"table></html>"
+
+#: ../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 "Заготовки с тегами"
@@ -13451,4 +13493,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 "Изменить параметры"
@@ -13655,5 +13698,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}''"
@@ -13945,10 +13988,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 "сервер вернул неожиданный формат id, текущее значение \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:278
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -13958,69 +14001,69 @@
 "\""
 
-#: ../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 "Пакет правок {0} успешно открыт"
 
-#: ../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 "требуется идентификатор пакета правок > 0. Получено {0}"
 
-#: ../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 "Обновление пакета правок {0}..."
 
-#: ../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 "Ожидание 10 секунд ... "
 
-#: ../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 "Попытка {0} из {1} через {2} секунды..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:458
 msgid "OK - trying again."
 msgstr "OK - пробуем ещё раз."
 
-#: ../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 "Попытка {0} из {1}."
 
-#: ../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 "Требуется, чтобы ID текущего пакета правок был > 0. Текущий ID: {0}."
 
-#: ../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}."
@@ -14221,4 +14264,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})"
@@ -14652,5 +14696,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:112
 msgid "Download skipped"
-msgstr ""
+msgstr "Скачивание пропущено"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:118
@@ -15025,5 +15069,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:109
 msgid "Processing plugin site cache icon files..."
-msgstr ""
+msgstr "Обработка файлов пиктограмм из кэша сайта модулей..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:133
@@ -15866,4 +15910,6 @@
 "around a chosen pivot."
 msgstr ""
+"Делает пару выделенных сегментов линий параллельными, путём поворота одного "
+"из них вокруг выбранного центра."
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:38
@@ -15876,4 +15922,6 @@
 "Please select two segments that don''t share any nodes."
 msgstr ""
+"Невозможно выравнивать соединённые сегменты.\n"
+"Пожалуйста, выберите два сегмента, которые не имеют общих точек."
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
@@ -15889,4 +15937,6 @@
 "Your action is being reverted."
 msgstr ""
+"Выравнивание может вынести точки за пределы мира.\n"
+"Ваше действие было отменено."
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
@@ -15919,4 +15969,7 @@
 "Please choose a different segment to be aligned."
 msgstr ""
+"Сегмент, который вы выравниваете, не может быть тем же самым, по которому "
+"выравниваете.\n"
+"Пожалуйста, выберите другой сегмент для выравнивания."
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:109
@@ -15925,4 +15978,7 @@
 "Please choose a different reference segment."
 msgstr ""
+"Сегмент, по которому выравниваете, не может быть тем же самым, который "
+"выравниваете.\n"
+"Пожалуйста, выберите другой сегмент, по которому выравниваете."
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:54
@@ -16142,9 +16198,29 @@
 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 "Задать размеры зданий"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#, fuzzy
+msgid "Rotate crosshair"
+msgstr "Повернуть вправо"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#, fuzzy
+msgid "Advanced settings"
+msgstr "Задать расширенные настройки"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#, fuzzy
+msgid "Building tag:"
+msgstr "Здание"
+
+#: ../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"
@@ -16153,35 +16229,48 @@
 #: ../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 "Создать здание"
+
+#: ../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
+#, fuzzy
+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"
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:379
+#, fuzzy
+msgid "Point on the corner of the building to start drawing"
+msgstr "Ткните в угол здания, чтобы начать рисовать"
+
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:381
+#, fuzzy
+msgid "Point on opposite end of the building"
 msgstr "Укажите противоположный конец здания"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
-msgid "Set width of building"
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:383
+#, fuzzy
+msgid "Set width of the building"
 msgstr "Задайте ширину здания"
 
@@ -16418,8 +16507,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 "вода"
@@ -16480,6 +16569,6 @@
 #. <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 "адрес"
@@ -16973,6 +17062,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 "Пустой слой"
@@ -17159,4 +17248,52 @@
 msgid "No GPX data layer found."
 msgstr "Не найдено слоя данных GPX"
+
+#: ../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 "Свойства зоопарка"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#, fuzzy
+msgid "Name:"
+msgstr "Название"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#, fuzzy
+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
+#, fuzzy, java-format
+msgid "Delete tool \"{0}\"?"
+msgstr "Удалить точку {0}"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:74
+msgid "Are you sure?"
+msgstr "Вы уверены?"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
+#, fuzzy
+msgid "New tool..."
+msgstr "Новая роль"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
+#, fuzzy
+msgid "Install"
+msgstr "Промышленная территория"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
@@ -18409,13 +18546,13 @@
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
 msgid "Revert changeset fully"
-msgstr ""
+msgstr "Полнростью вернуть пакет правок"
 
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert selection only"
-msgstr ""
+msgstr "Вернуть только выделенное"
 
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
 msgid "Revert selection and restore deleted objects"
-msgstr ""
+msgstr "Вернуть выделенное и восстановить удалённые объекты"
 
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
@@ -18429,13 +18566,13 @@
 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}"
-msgstr ""
+msgstr "Отсутствует результат слияния для {0} с id {1}"
 
 #: ../plugins/reverter/src/reverter/DataSetToCmd.java:51
 #, java-format
 msgid "Target of type {0} with id {1} has invalid version"
-msgstr ""
+msgstr "Полученный тип {0} с id {1} имеет неправильную версию"
 
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15
@@ -18474,5 +18611,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:75
 msgid "Downloading changeset"
-msgstr ""
+msgstr "Скачивание пакета правок"
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:98
@@ -18480,4 +18617,41 @@
 msgid "Revert changeset #{0}"
 msgstr "Откатить пакет правок #{0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:78
+#, fuzzy
+msgid "Road Sign Plugin"
+msgstr "Загрузка модулей"
+
+#: ../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 "Не удалось прочитать источник заготовок тегов: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
+#, fuzzy, java-format
+msgid "Error parsing tagging preset from ''{0}'':\n"
+msgstr "Разбор списка модулей с сайта ''{0}''"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:104
+#, fuzzy, java-format
+msgid "Sign {0}"
+msgstr "Выбор: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:111
+#, fuzzy, java-format
+msgid "Additional sign {0}"
+msgstr "Добавить отношение {0}"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -18583,4 +18757,15 @@
 msgid "Enter weight values"
 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 "Упростить линию"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
+#, fuzzy
+msgid "Delete unnecessary nodes from an area."
+msgstr "Удалить из линии ненужные точки."
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
@@ -20090,5 +20275,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:120
 msgid "Area style way is not closed"
-msgstr ""
+msgstr "Линия стиля \"область\" не замкнута"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:134
@@ -20098,13 +20283,13 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:151
 msgid "No style in multipolygon relation"
-msgstr ""
+msgstr "В отношении мультиполигон не задан стиль"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:169
 msgid "Style for inner way equals multipolygon"
-msgstr ""
+msgstr "Стиль внутренней линии - мультиполигон"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:180
 msgid "Style for outer way mismatches"
-msgstr ""
+msgstr "Несоответствие стиля для внешней линии"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:186
@@ -20118,5 +20303,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:213
 msgid "Multipolygon inner way is outside"
-msgstr ""
+msgstr "Внутренняя линия мультиполигона находится за его пределами"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:216
@@ -20609,5 +20794,5 @@
 #. <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 "полигон"
@@ -20706,12 +20891,149 @@
 msgstr "{0}, ..."
 
-#: ../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
+#, fuzzy, java-format
+msgid "{0} {1}% of GPS track"
+msgstr "{0} покрывает {1}% трека GPS"
+
+#: ../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 "Импортировать аудиофайлы"
+
+#: ../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 "Удалить"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
+#, fuzzy
+msgid "removes current video from layer"
+msgstr "Удалить фото из слоя"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
+#, fuzzy
+msgid "play/pause"
+msgstr "Воспроизведение/Пауза"
+
+#: ../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 "фон"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
+#, fuzzy
+msgid "jumps n sec back"
+msgstr "Перемотать назад."
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "forward"
+msgstr "Вперёд"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "jumps n sec forward"
+msgstr "Перемотать вперёд"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
+#, fuzzy
+msgid "faster"
+msgstr "Быстрее"
+
+#: ../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 "Медленнее"
+
+#: ../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 "Позволяет добавлять метки/точки в текущей GPS позиции."
+
+#. 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
+#, fuzzy
+msgid "Jump length"
+msgstr "Перейти туда"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#, fuzzy
+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
+#, fuzzy
+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
+#, fuzzy
+msgid "deinterlacing using linear interpolation"
+msgstr "Интерполяционный фильтр изображения:"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:99
+#, fuzzy
+msgid "play"
+msgstr "слоя"
+
+#: ../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 ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -20946,9 +21268,9 @@
 "Это может привести к ошибочным координатам."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
 msgid "Automatic downloading"
 msgstr "Автоматическое скачивание"
 
-#: ../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}''"
@@ -20957,19 +21279,19 @@
 "искажена"
 
-#: ../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 "Автоматическое скачивание слоя WMS ({0}), в масштабе {1}"
 
-#: ../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 "Скачивание слоя WMS ({0}), в масштабе {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
 #, java-format
 msgid ""
@@ -20984,17 +21306,17 @@
 "попытаться извлечь квадраты WMS?"
 
-#: ../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 "Скачать видимые квадраты карты"
 
-#: ../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"
@@ -21003,33 +21325,33 @@
 "измените разрешение"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329
 msgid "Change resolution"
 msgstr "Изменить разрешение"
 
-#: ../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 "Сохранить слой WMS в файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
 msgid "Save WMS layer"
 msgstr "Сохранить WMS слой"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413
 msgid "Load WMS layer from file"
 msgstr "Загрузить слой WMS из файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
 msgid "Load WMS layer"
 msgstr "Загрузить WMS слой"
 
-#: ../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}"
@@ -21037,63 +21359,63 @@
 "Неподдерживаемый формат версии WMS файла; обнаружено {0}, ожидалось {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 "Установить закладку WMS"
 
-#: ../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 "Открыть пустой WMS-слой для загрузки данных из файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
 msgid "WMS Plugin Preferences"
 msgstr "Настройки модуля WMS"
 
-#: ../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 "Измениить список серверов WMS, отображаемых в меню модуля WMS"
 
-#: ../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 "Название меню"
 
-#: ../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 "Ссылка на 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 "WMS URL (по умолчанию)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:86
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
 msgid "Enter a menu name and WMS URL"
 msgstr "Введите имя пункта меню и URL этого 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 "Средство скачивания:"
@@ -21110,4 +21432,9 @@
 msgid "% of north:"
 msgstr "% севернее:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186
+#, fuzzy
+msgid "Simultaneous connections"
+msgstr "Точка: соединение"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -21176,5 +21503,5 @@
 #. <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 "лесопосадки"
@@ -21269,12 +21596,12 @@
 #. <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 "граница"
@@ -21358,9 +21685,9 @@
 #. <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 "маршрут"
@@ -21379,5 +21706,5 @@
 #: build/specialmessages.java:23
 msgid "Abort file chooser dialog."
-msgstr ""
+msgstr "Отменить диалог выбора файла."
 
 #. Strings in JFileChooser
@@ -21389,20 +21716,20 @@
 #: build/specialmessages.java:26
 msgid "Delete File"
-msgstr ""
+msgstr "Удалить файл"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:28
 msgid "Enter file name:"
-msgstr ""
+msgstr "Укажите имя файла"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:29
 msgid "Enter path or folder name:"
-msgstr ""
+msgstr "Введите путь или имя каталога:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:30
 msgid "Error "
-msgstr ""
+msgstr "Ошибка "
 
 #. Strings in JFileChooser
@@ -21410,5 +21737,5 @@
 #, java-format
 msgid "Error renaming file \"{0}\" to \"{1}\""
-msgstr ""
+msgstr "Ошибка переименования файла \"{0}\" в \"{1}\""
 
 #. Strings in JFileChooser
@@ -21420,15 +21747,15 @@
 #: build/specialmessages.java:33
 msgid "File Name:"
-msgstr ""
+msgstr "Имя файла:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:34
 msgid "FileChooser help."
-msgstr ""
+msgstr "Справка по выбору файла."
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:35
 msgid "Files"
-msgstr ""
+msgstr "Файлы"
 
 #. Strings in JFileChooser
@@ -21440,15 +21767,15 @@
 #: build/specialmessages.java:37
 msgid "Files of Type:"
-msgstr ""
+msgstr "Файлы типа:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:39
 msgid "Filter:"
-msgstr ""
+msgstr "Фильтр:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:40
 msgid "Folders"
-msgstr ""
+msgstr "Каталоги"
 
 #. Strings in JFileChooser
@@ -21470,5 +21797,5 @@
 #: build/specialmessages.java:45
 msgid "Look In:"
-msgstr ""
+msgstr "Папка:"
 
 #. Strings in JFileChooser
@@ -21485,10 +21812,10 @@
 #: build/specialmessages.java:51
 msgid "Open selected file."
-msgstr ""
+msgstr "Открыть выбранный файл"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:53
 msgid "Rename File"
-msgstr ""
+msgstr "Переименовать файл"
 
 #. Strings in JFileChooser
@@ -21496,5 +21823,5 @@
 #, java-format
 msgid "Rename file \"{0}\" to"
-msgstr ""
+msgstr "Сменить имя файла \"{0}\" на"
 
 #. Strings in JFileChooser
@@ -21506,15 +21833,15 @@
 #: build/specialmessages.java:57
 msgid "Save In:"
-msgstr ""
+msgstr "Сохранить в:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:58
 msgid "Save selected file."
-msgstr ""
+msgstr "Сохранить выделенный файл."
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:59
 msgid "Selection:"
-msgstr ""
+msgstr "Выбор:"
 
 #. Strings in JFileChooser
@@ -21536,40 +21863,40 @@
 #: build/specialmessages.java:65
 msgid "Update directory listing."
-msgstr ""
+msgstr "Обновить список каталога."
 
 #. Strings in GTK ColorChooser
 #: build/specialmessages.java:68
 msgid "Blue:"
-msgstr ""
+msgstr "Синий:"
 
 #. Strings in GTK ColorChooser
 #: build/specialmessages.java:69
 msgid "Color Name:"
-msgstr ""
+msgstr "Цвет:"
 
 #. Strings in GTK ColorChooser
 #: build/specialmessages.java:70
 msgid "Green:"
-msgstr ""
+msgstr "Зелёный:"
 
 #. Strings in GTK ColorChooser
 #: build/specialmessages.java:71
 msgid "Hue:"
-msgstr ""
+msgstr "Оттенок:"
 
 #. Strings in GTK ColorChooser
 #: build/specialmessages.java:72
 msgid "GTK Color Chooser"
-msgstr ""
+msgstr "Выбор цвета GTK"
 
 #. Strings in GTK ColorChooser
 #: build/specialmessages.java:73
 msgid "Red:"
-msgstr ""
+msgstr "Красный:"
 
 #. Strings in GTK ColorChooser
 #: build/specialmessages.java:74
 msgid "Saturation:"
-msgstr ""
+msgstr "Насыщенность:"
 
 #. Plugin AddrInterpolation
@@ -21650,5 +21977,5 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:26
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
@@ -21656,15 +21983,15 @@
 
 #. 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 "
@@ -21677,10 +22004,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:34
 msgid "Helps vectorizing WMS images."
 msgstr "Помогает векторизовать изображения WMS."
 
 #. 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."
@@ -21689,5 +22016,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 "
@@ -21700,15 +22027,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 "Добавляет запрет поворота налево для наборов из 4 или 5 линий"
 
 #. 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 "
@@ -21719,5 +22046,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 "
@@ -21730,15 +22057,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:48
 msgid "Displays an OpenLayers background image"
 msgstr "Отображает фоновый рисунок OpenLayers"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:50
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Импорт вопросов из OpenStreetBugs"
 
 #. 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"
@@ -21748,5 +22075,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."
@@ -21756,5 +22083,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 "
@@ -21765,5 +22092,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 "
@@ -21774,10 +22101,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Великолепный JGoodies Пластиковый Скин."
 
 #. 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."
@@ -21787,15 +22114,16 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "Let other applications send commands to JOSM."
 msgstr "Разрешить другим приложениям посылать команды в JOSM."
 
 #. 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 "
@@ -21806,10 +22134,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 "
@@ -21820,15 +22155,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:77
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Позволяет добавлять метки/точки в текущей GPS позиции."
 
 #. 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 "
@@ -21841,10 +22176,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). "
@@ -21856,5 +22191,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) "
@@ -21865,5 +22200,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:89
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21874,10 +22209,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:91
 msgid "Allows undeleting object from OSM database"
 msgstr "Позволяет восстанавливать объекты, удаленные из базы данных OSM"
 
 #. 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 "
@@ -21889,5 +22224,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 "
@@ -21900,5 +22235,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:97
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21909,15 +22244,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 "
@@ -21929,5 +22264,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:105
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22321,5 +22656,5 @@
 #: build/trans_presets.java:1252
 msgid "Embankment"
-msgstr "Набережная"
+msgstr "Насыпь"
 
 #. item "Highways/Streets/Motorway" check "Embankment"
@@ -22824,5 +23159,5 @@
 #. <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 "Круг"
@@ -23285,5 +23620,5 @@
 #. <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 "дорога местного значения"
@@ -23318,5 +23653,5 @@
 #. <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 "служебный проезд"
@@ -23350,6 +23685,6 @@
 #. <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 "строящаяся дорога"
@@ -24359,5 +24694,5 @@
 #. <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 "открытое болото"
@@ -24750,9 +25085,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 "рельс"
@@ -26923,28 +27258,28 @@
 #: 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 "спорт"
@@ -28691,9 +29026,9 @@
 #. <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 "зелёный"
@@ -30132,8 +30467,16 @@
 #. </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>
@@ -30145,4 +30488,13 @@
 #. <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 -->
@@ -30190,7 +30542,8 @@
 #: 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 "велосипедный"
@@ -30250,4 +30603,12 @@
 #. <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>
@@ -30268,6 +30629,7 @@
 #: 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 "пеший"
@@ -30289,5 +30651,5 @@
 #. <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 "линия метро"
@@ -30583,5 +30945,5 @@
 #: 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 "устаревший"
@@ -30964,7 +31326,7 @@
 #. <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 "трек автодороги"
@@ -31056,5 +31418,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:842
+#: build/trans_style.java:867
 msgid "services"
 msgstr "услуги"
@@ -31068,5 +31430,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:850
+#: build/trans_style.java:875
 msgid "ford"
 msgstr "брод"
@@ -31087,5 +31449,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:865
+#: build/trans_style.java:890
 msgid "turningcircle"
 msgstr "круг для разворота"
@@ -31100,5 +31462,5 @@
 #. <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 "пункт_неотложной_помощи"
@@ -31113,5 +31475,5 @@
 #. <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 "берег реки"
@@ -31125,5 +31487,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:1018
+#: build/trans_style.java:1043
 msgid "stream"
 msgstr "поток"
@@ -31137,5 +31499,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1041
+#: build/trans_style.java:1066
 msgid "dock"
 msgstr "док"
@@ -31332,14 +31694,14 @@
 #. <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 "искусственный"
@@ -31353,5 +31715,5 @@
 #. <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 "Водные пороги"
@@ -31413,7 +31775,7 @@
 #. <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 "ж/д путевая точка"
@@ -31436,10 +31798,10 @@
 #. <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 "жд дорога сверху"
@@ -31475,7 +31837,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 "Старая жд дорога"
@@ -31521,6 +31883,6 @@
 #. <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 "воздушная трасса"
@@ -31534,5 +31896,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1327
+#: build/trans_style.java:1352
 msgid "terminal"
 msgstr "пассажирский терминал"
@@ -31554,5 +31916,5 @@
 #. <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 "тёмная воздушная трасса"
@@ -31566,5 +31928,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1359
+#: build/trans_style.java:1384
 msgid "aeroway_light"
 msgstr "светлая воздушная трасса"
@@ -31634,7 +31996,7 @@
 #. <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 "канатная дорога"
@@ -31651,5 +32013,5 @@
 #. <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 "простая_лыжня"
@@ -31664,5 +32026,5 @@
 #. <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 "нормальная_лыжня"
@@ -31677,5 +32039,5 @@
 #. <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 "усложнённая_лыжня"
@@ -31690,5 +32052,5 @@
 #. <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 "очень_сложная_лыжня"
@@ -31703,5 +32065,5 @@
 #. <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 "лыжня_произвольного_стиля"
@@ -31716,5 +32078,5 @@
 #. <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 "новичковая_лыжня"
@@ -31834,11 +32196,11 @@
 #. <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 "энергия"
@@ -31852,5 +32214,5 @@
 #. <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 "пирс"
@@ -31864,5 +32226,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1643
+#: build/trans_style.java:1668
 msgid "pipeline"
 msgstr "трубопровод"
@@ -32006,13 +32368,13 @@
 #. <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 "развлечения"
@@ -32026,5 +32388,5 @@
 #. <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 "гавань"
@@ -32120,10 +32482,10 @@
 #. <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 "инфраструктура"
@@ -32225,10 +32587,10 @@
 #. <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 "режим_работы"
@@ -32617,4 +32979,12 @@
 #.
 #. <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"/>
 #. color amenity_light
@@ -32658,23 +33028,24 @@
 #. <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 "инфраструктура_светлый"
@@ -32706,6 +33077,6 @@
 #. <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 "светлая_вода"
@@ -32766,8 +33137,8 @@
 #. <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 "здоровье"
@@ -33120,26 +33491,26 @@
 #. <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 "магазин"
@@ -33211,8 +33582,8 @@
 #. <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 "отель"
@@ -33313,9 +33684,9 @@
 #. <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 "туристический"
@@ -33403,9 +33774,9 @@
 #. <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 "исторический"
@@ -33418,5 +33789,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3196
+#: build/trans_style.java:3229
 msgid "quarry"
 msgstr "карьер"
@@ -33430,5 +33801,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3204
+#: build/trans_style.java:3237
 msgid "landfill"
 msgstr "мусорная свалка"
@@ -33450,5 +33821,5 @@
 #. <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 "водоём"
@@ -33462,5 +33833,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3260
+#: build/trans_style.java:3293
 msgid "farmyard"
 msgstr "двор фермы"
@@ -33483,5 +33854,5 @@
 #. <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 "розничная продажа"
@@ -33495,5 +33866,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3285
+#: build/trans_style.java:3318
 msgid "industrial"
 msgstr "промышленный"
@@ -33507,5 +33878,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3326
 msgid "brownfield"
 msgstr "заброшенная застройка"
@@ -33519,5 +33890,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3334
 msgid "greenfield"
 msgstr "участок для застройки"
@@ -33531,5 +33902,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3309
+#: build/trans_style.java:3342
 msgid "railland"
 msgstr "жд разъезд"
@@ -33586,7 +33957,7 @@
 #. <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 "военный"
@@ -33600,5 +33971,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3367
 msgid "cemetery"
 msgstr "кладбище"
@@ -33611,5 +33982,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3410
+#: build/trans_style.java:3443
 msgid "peak"
 msgstr "пик"
@@ -33624,5 +33995,5 @@
 #. <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 "ледник"
@@ -33636,5 +34007,5 @@
 #. <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 "вулкан"
@@ -33689,8 +34060,8 @@
 #. <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 "природный"
@@ -33704,5 +34075,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3485
 msgid "scrub"
 msgstr "кустарник"
@@ -33716,5 +34087,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468
+#: build/trans_style.java:3501
 msgid "heath"
 msgstr "пустошь"
@@ -33728,5 +34099,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3476
+#: build/trans_style.java:3509
 msgid "woodarea"
 msgstr "лес"
@@ -33740,5 +34111,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3508
+#: build/trans_style.java:3541
 msgid "mud"
 msgstr "грязь"
@@ -33752,5 +34123,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3516
+#: build/trans_style.java:3549
 msgid "beach"
 msgstr "пляж"
@@ -33900,11 +34271,11 @@
 #. <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 "место"
@@ -33918,5 +34289,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4239
+#: build/trans_style.java:4272
 msgid "tiger_data"
 msgstr "данные TIGER"
@@ -34273,4 +34644,13 @@
 msgstr "Sicily - Италия"
 
+#~ 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 ""
+#~ "Полученный объект с id {0} и версией {1} видимый, хотя оригинал с более "
+#~ "низкой версией {2} не видимый. Это несоответствие невозможно. Полученный "
+#~ "объект сохранён. "
+
 #~ msgid "No data imported."
 #~ msgstr "Данные не импортированы"
@@ -34620,7 +35000,4 @@
 #~ msgid "zoom"
 #~ msgstr "масштаб"
-
-#~ msgid "Are you sure?"
-#~ msgstr "Вы уверены?"
 
 #~ msgid "Adjust the position of the WMS layer"
Index: /applications/editors/josm/i18n/po/sk.po
===================================================================
--- /applications/editors/josm/i18n/po/sk.po	(revision 21970)
+++ /applications/editors/josm/i18n/po/sk.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-15 14:20+0000\n"
+"POT-Creation-Date: 2010-06-23 22:47+0200\n"
+"PO-Revision-Date: 2010-06-21 17:43+0000\n"
 "Last-Translator: Vlado <babicvm@szm.sk>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2010-06-15 16:22+0000\n"
+"X-Launchpad-Export-Date: 2010-06-23 20:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -23,5 +23,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
@@ -93,5 +93,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
@@ -101,6 +101,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:470
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
-msgstr ""
-"Parameter \"downloadgps\" neakceptuje  názov súboru, alebo URL súboru"
+msgstr "Parameter \"downloadgps\" neakceptuje  názov súboru, alebo URL súboru"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:538
@@ -254,5 +253,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
@@ -275,5 +274,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
@@ -281,6 +280,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
@@ -289,4 +290,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
@@ -324,9 +327,9 @@
 #, java-format
 msgid ""
-"<html>There are no layers the source layer<br>''{0}''<br>could be merged "
-"to.</html>"
-msgstr ""
-"<html>Nie sú tam vrstvy zdrojovej vrstvy<br>''{0}''<br>nemôžu byť "
-"zlúčené.</html>"
+"<html>There are no layers the source layer<br>''{0}''<br>could be merged to."
+"</html>"
+msgstr ""
+"<html>Nie sú tam vrstvy zdrojovej vrstvy<br>''{0}''<br>nemôžu byť zlúčené.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:81
@@ -349,9 +352,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
@@ -411,4 +414,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
@@ -448,5 +452,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 "Informácia"
@@ -658,5 +662,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
@@ -671,5 +675,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 "Odstrániť"
@@ -893,6 +897,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr ""
-"Zobraziť informácie o objekte o OSM bodoch, cestách, alebo reláciách."
+msgstr "Zobraziť informácie o objekte o OSM bodoch, cestách, alebo reláciách."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:114
@@ -919,4 +922,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 ""
@@ -928,4 +932,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 "To môže spôsobiť nechcené vymazanie uzlov."
@@ -1109,6 +1114,5 @@
 msgid ""
 "Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
-msgstr ""
-"Nemôžem spojiť body: Mám zmazať cestu ''{0}'' ktorá je ešte používaná."
+msgstr "Nemôžem spojiť body: Mám zmazať cestu ''{0}'' ktorá je ešte používaná."
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:269
@@ -1503,6 +1507,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
@@ -1529,4 +1533,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
@@ -1535,6 +1541,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 "Chyba"
@@ -1650,6 +1656,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 ""
 "Zobraziť správu o stave s užitočnými informáciami, ktoré sa môžu viazať ku "
@@ -1687,8 +1692,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 "Áno, vymazať body"
 
 #: ../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 "Vymazať body mimo sťahovanej oblasti dát"
@@ -1697,5 +1704,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 "Nie, zrušiť"
@@ -1703,16 +1711,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 "Zušiť operáciu"
 
 #: ../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 "Chcete ich aj tak vymazať?"
 
 #: ../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 "Vymazať body mimo sťahovanej oblasti?"
 
 #: ../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 "Vyberte aspoň jednu cestu k zjednodušeniu."
@@ -1721,13 +1734,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 "Áno"
 
 #: ../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 "Zjednodušiť všetky vybraté cesty"
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:126
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:89
 #, java-format
 msgid ""
@@ -1736,8 +1752,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 "Zjednodušiť cesty?"
 
 #: ../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"
@@ -1748,4 +1766,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)"
@@ -1822,6 +1841,6 @@
 msgstr ""
 "<html>Funkcia umiestnená v relačnom člene bola skopírovaná do všetkých "
-"nových ciest.<br>Mali by ste toto potvrdiť a opraviť to ak je to "
-"potrebné.</html>"
+"nových ciest.<br>Mali by ste toto potvrdiť a opraviť to ak je to potrebné.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
@@ -1890,6 +1909,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 ""
 "* Jeden bod používaný viac než jednou cestou a jednu z týchto ciest, alebo"
@@ -1964,9 +1982,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)"
@@ -1983,5 +2001,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
@@ -2048,5 +2066,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 "Žiadne zmeny pre uloženie."
@@ -2064,14 +2081,14 @@
 msgstr "Nahrať všetky zmeny v aktuálnom výbere na OSM server."
 
-#: ../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 "Kontrola rodičovských pre zmazané objekty"
 
-#: ../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 "Čítanie rodičovských z ''{0}''"
 
-#: ../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 "Kontrola pre zmazané rodičovské v lokálnej dátovej sade"
@@ -2251,5 +2268,15 @@
 "report a conflict."
 msgstr[0] ""
+"Je tam {0} objekt v miestnej dátovej sade, ktorý by mohol byť odstránený zo "
+"servera. Ak sa neskôr pokúsite zmazať alebo aktualizovať tento objekt na "
+"serveri, je pravdepodobné hlásenie o konflikte."
 msgstr[1] ""
+"Sú tam {0} objekty v miestnej dátovej sade, ktoré by mohli byť odstránené zo "
+"servera. Ak sa neskôr pokúsite zmazať alebo aktualizovať tieto objekty na "
+"serveri, je pravdepodobné hlásenie o konflikte."
+msgstr[2] ""
+"Je tam {0} objektov v miestnej dátovej sade, ktoré by mohli byť odstránené "
+"zo servera. Ak sa neskôr pokúsite zmazať alebo aktualizovať tieto objekty na "
+"serveri, je pravdepodobné hlásenie o konflikte."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:169
@@ -2260,5 +2287,12 @@
 "Click <strong>{0}</strong> to check the state of these objects on the server."
 msgstr[0] ""
+"Kliknite na tlačidlo <strong>{0}</strong> ak chcete skontrolovať stav tohto "
+"objektu na serveri."
 msgstr[1] ""
+"Kliknite na tlačidlo <strong>{0}</strong> ak chcete skontrolovať stav týchto "
+"objektov na serveri."
+msgstr[2] ""
+"Kliknite na tlačidlo <strong>{0}</strong> ak chcete skontrolovať stav týchto "
+"objektov na serveri."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
@@ -2330,5 +2364,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
@@ -2449,6 +2483,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
 msgid ""
-"Drag play head and release near track to play audio from there; "
-"SHIFT+release to synchronize audio at that point."
+"Drag play head and release near track to play audio from there; SHIFT"
+"+release to synchronize audio at that point."
 msgstr ""
 "Ťahajte \"play head\" a uvoľnite ho blízko miesta odkadiaľ chcete zvukový "
@@ -2586,5 +2620,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."
@@ -2654,6 +2688,6 @@
 "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
 msgstr ""
-"<b>type=*</b> - kľúč ''type'' s nejakou hodnotou. Skúste tiež "
-"<b>*=hodnota</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
+"<b>type=*</b> - kľúč ''type'' s nejakou hodnotou. Skúste tiež <b>*=hodnota</"
+"b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
@@ -2677,6 +2711,6 @@
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr ""
-"<b>type:</b> - typy objektov (<b>bod</b>, <b>cesta</b>, "
-"<b>vzťah(relácia)</b>)"
+"<b>type:</b> - typy objektov (<b>bod</b>, <b>cesta</b>, <b>vzťah(relácia)</"
+"b>)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
@@ -2710,6 +2744,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 ""
 "<b>body:</b>... - objekt s danými číslami bodov (body:počet alebo body:min-"
@@ -2769,6 +2803,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-"Použite <b>\"</b> operátor citovania (e.g. ak kľúč obsahuje <b>:</b>)"
+msgstr "Použite <b>\"</b> operátor citovania (e.g. ak kľúč obsahuje <b>:</b>)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
@@ -2777,6 +2810,6 @@
 "escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
 msgstr ""
-"Vo vnútri reťazcov <b>\"</b> a <b>\\</b> znaky musí predchádzať <b>\\</b> "
-"(e.g. <b>\\\"</b> and <b>\\\\</b>)."
+"Vo vnútri reťazcov <b>\"</b> a <b>\\</b> znaky musí predchádzať <b>\\</b> (e."
+"g. <b>\\\"</b> and <b>\\\\</b>)."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
@@ -2963,6 +2996,6 @@
 "dependency.</html>"
 msgstr ""
-"<html>{0} relácie sa cyklujú(build a cycle) pretože odkazujú na nejaké "
-"iné.<br>JOSM ich nemôže nahrať. Prosím upravte relácie a odstráňte cyklické "
+"<html>{0} relácie sa cyklujú(build a cycle) pretože odkazujú na nejaké iné."
+"<br>JOSM ich nemôže nahrať. Prosím upravte relácie a odstráňte cyklické "
 "závislosti.</html>"
 
@@ -2994,10 +3027,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
@@ -3124,11 +3161,10 @@
 
 #: ../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
 msgid ""
 "Cannot undo command ''{0}'' because layer ''{1}'' is not present any more"
-msgstr ""
-"Nemôžem zrušiť príkaz \"{0}\", pretože vrstva \"{1}\" nie je vybraná."
+msgstr "Nemôžem zrušiť príkaz \"{0}\", pretože vrstva \"{1}\" nie je vybraná."
 
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:42
@@ -3206,11 +3242,11 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231
 msgid ""
-"You are about to delete nodes outside of the area you have "
-"downloaded.<br>This can cause problems because other objects (that you do "
-"not see) might use them.<br>Do you really want to delete?"
+"You are about to delete nodes outside of the area you have downloaded."
+"<br>This can cause problems because other objects (that you do not see) "
+"might use them.<br>Do you really want to delete?"
 msgstr ""
 "Chystáte sa zmazať body mimo Vami stiahnutú oblasť.<br>Toto môže spôsobiť "
-"problém iným objektom (nevidíte ich), ktoré môžu používať tieto "
-"body.<br>Naozaj ich chcete zmazať?"
+"problém iným objektom (nevidíte ich), ktoré môžu používať tieto body."
+"<br>Naozaj ich chcete zmazať?"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
@@ -3258,11 +3294,11 @@
 msgstr[2] "Posun {0} bodov"
 
-#: ../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 "Očistený objekt ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111
 #, java-format
 msgid "Purged {0} object"
@@ -3272,5 +3308,5 @@
 msgstr[2] "Očistených {0} objektov"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 #, java-format
 msgid ""
@@ -3281,5 +3317,5 @@
 "je {1}"
 
-#: ../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}"
@@ -3503,9 +3539,9 @@
 #, java-format
 msgid ""
-"<html>Preferences file had errors.<br> Making backup of old one to "
-"<br>{0}<br> and creating a new default preference file.</html>"
-msgstr ""
-"<html>Súbor preferencií mal chyby.<br> Vytváranie zo zálohy staršieho súboru "
-" <br>{0}<br> a vytváranie nového východzieho súboru.</html>"
+"<html>Preferences file had errors.<br> Making backup of old one to <br>{0}"
+"<br> and creating a new default preference file.</html>"
+msgstr ""
+"<html>Súbor preferencií mal chyby.<br> Vytváranie zo zálohy staršieho "
+"súboru  <br>{0}<br> a vytváranie nového východzieho súboru.</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
@@ -3597,5 +3633,5 @@
 #. *
 #. * the decimal format 999.999
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3604,5 +3640,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3611,5 +3647,5 @@
 #. *
 #. * coordinates East/North
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3644,6 +3680,5 @@
 msgid ""
 "Unable to add primitive {0} to the dataset because it is already included"
-msgstr ""
-"Neschopnosť pridať pôvodné {0} do dátovej sady, pretože sú už zahrnuté"
+msgstr "Neschopnosť pridať pôvodné {0} do dátovej sady, pretože sú už zahrnuté"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:656
@@ -3660,4 +3695,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}"
@@ -3669,33 +3707,24 @@
 msgstr "Chýba zlúčujúci ciel pre objekt s id {0}"
 
-#: ../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 "Chýba zlúčujúci ciel pre bod s id {0}"
 
-#: ../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 "Chýba zlúčujúci ciel pre reláciu s id {0}"
 
-#: ../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 "Chýba zlúčujúci ciel typu {0} s id {1}"
-
-#. 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 ""
-"Cieľový objekt s id {0} a verziou {1} je viditeľný aj keď zdrojový objekt s "
-"nižšou verziou {2} nie je viditeľný. Nemôžem sa zaoberať s touto "
-"nezrovnalosťou. Ponechávam cieľový objekt. "
 
 #. translators notes must be in front
@@ -3774,19 +3803,19 @@
 "</p><p>Zatvorte dialóg filtra, aby sa zobrazili všetky objekty.<p></html>"
 
-#: ../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 "pôvodné s id=0 nemôžu byť neviditeľné"
 
-#: ../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 "ID > 0 očakávané. Got {0}"
 
-#: ../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 "verzia > 0 očakávaná. Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:795
 #, java-format
 msgid ""
@@ -3797,5 +3826,5 @@
 "zmenového súboru je {0}"
 
-#: ../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 "
@@ -3805,10 +3834,9 @@
 "ostatné nie sú"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1169
 #, java-format
 msgid ""
 "Cannot merge primitives with different ids. This id is {0}, the other is {1}"
-msgstr ""
-"Nemožno zlúčiť pôvodné s rozdielnymi id. Toto id je {0}, druhé je {1}"
+msgstr "Nemožno zlúčiť pôvodné s rozdielnymi id. Toto id je {0}, druhé je {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
@@ -3865,6 +3893,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 "Nemôžem porovnať pôvodné s ID ''{0}'' s pôvodným s ID ''{1}''."
 
@@ -3879,5 +3906,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 "zvolené"
@@ -4043,6 +4070,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 "<html>Nemôžem čítať záložky z<br>''{0}''<br>Chyba bola: {1}</html>"
 
@@ -4114,5 +4140,5 @@
 #. color tiger_data
 #. </rule>
-#. 
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4122,5 +4148,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4129,5 +4155,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4136,5 +4162,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4143,5 +4169,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4150,5 +4176,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4157,9 +4183,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--annotation tags -->
-#. 
+#.
 #. <!--"work in progress" tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="building"/>
@@ -4168,5 +4194,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 "budova"
@@ -4254,5 +4280,5 @@
 msgstr "Objekt je vymazaný"
 
-#: ../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
@@ -4479,6 +4505,5 @@
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
-msgstr ""
-"Nastavenie predvoľby {0} bolo vymazané, pretože nebola dlho používaná."
+msgstr "Nastavenie predvoľby {0} bolo vymazané, pretože nebola dlho používaná."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
@@ -4488,5 +4513,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
@@ -4495,4 +4520,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
@@ -4669,6 +4695,6 @@
 "relations</strong>.</html>"
 msgstr ""
-"<html>Prosím potvrdiť odstránenie <strong>{0} objektov</strong> z "
-"<strong>{1} relácií</strong>.</html>"
+"<html>Prosím potvrdiť odstránenie <strong>{0} objektov</strong> z <strong>"
+"{1} relácií</strong>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165
@@ -4701,5 +4727,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
@@ -4740,6 +4766,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 ""
 "<html>Okrem iného môžete vložiť <strong>adresu dlaždíc</strong> pre "
@@ -4775,5 +4801,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"
@@ -4782,5 +4808,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"
@@ -4789,5 +4815,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"
@@ -5017,6 +5043,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 ""
 "Kopírovať ich vybrané elementy na koniec zoznamu pre spojované elementy"
@@ -5101,6 +5126,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their "
-"entries.</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 "<html>Klik <strong>{0}</strong>pre začiatok spojovania mojich a ich "
@@ -5110,9 +5135,9 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their "
-"entries.</html>"
-msgstr ""
-"<html>Klik <strong>{0}</strong>pre koniec spojovania mojich a ich "
-"položiek</html>"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
+"html>"
+msgstr ""
+"<html>Klik <strong>{0}</strong>pre koniec spojovania mojich a ich položiek</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:873
@@ -5162,12 +5187,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
-msgstr ""
-"Spojované body sú ešte neblokované. Nie je možné dať vykonávací povel"
+msgstr "Spojované body sú ešte neblokované. Nie je možné dať vykonávací povel"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464
 #, java-format
 msgid ""
-"<html>An error occurred while communicating with the server<br>Details: "
-"{0}</html>"
+"<html>An error occurred while communicating with the server<br>Details: {0}</"
+"html>"
 msgstr ""
 "<html>Nastala chyba počas komunikácie so serverom<br>Detaily: {0}</html>"
@@ -5355,6 +5379,6 @@
 "dataset.<br>Do you agree?</html>"
 msgstr ""
-"<html>JOSM odstráni vaše lokálne pôvodné s id {0}<br>z dátovej "
-"sady.<br>Súhlasíte?</html>"
+"<html>JOSM odstráni vaše lokálne pôvodné s id {0}<br>z dátovej sady."
+"<br>Súhlasíte?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685
@@ -5404,10 +5428,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"
@@ -5416,10 +5442,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
@@ -5501,4 +5529,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 "žiadny"
@@ -5656,6 +5685,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr ""
-"<html>Vložte kľúč značky, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr "<html>Vložte kľúč značky, i.e. <strong><tt>fixme</tt></strong></html>"
 
 #. Strings in GTK ColorChooser
@@ -5670,6 +5698,6 @@
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
 msgstr ""
-"<html>Vložte hodnotu značky, i.e. <strong><tt>kontrola "
-"členov</tt></strong></html>"
+"<html>Vložte hodnotu značky, i.e. <strong><tt>kontrola členov</tt></strong></"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
@@ -5720,6 +5748,6 @@
 msgid "<html>Please select the values to keep for the following tags.</html>"
 msgstr ""
-"<html>Prisím vyberte ktoré hodnoty ponechať pre nasledujúce "
-"značky(tags).</html>"
+"<html>Prisím vyberte ktoré hodnoty ponechať pre nasledujúce značky(tags).</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:48
@@ -5737,11 +5765,11 @@
 #: ../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>"
-msgstr ""
-"<html>Vybrať na zobrazenie iba zmenové súbory pre aktuálne vybraté "
-"objekty.<br>Odobrať zo zobrazenia všetky zmenové súbory pre objekty v "
-"súčasnej dátovej vrstve.</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 ""
+"<html>Vybrať na zobrazenie iba zmenové súbory pre aktuálne vybraté objekty."
+"<br>Odobrať zo zobrazenia všetky zmenové súbory pre objekty v súčasnej "
+"dátovej vrstve.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
@@ -5765,6 +5793,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 "Stiahnuť informácie a vybratých zmenových súboroch z OSM servera"
 
@@ -5800,6 +5827,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74
 msgid "Open a list of all commands (undo buffer)."
-msgstr ""
-"Otvorte prehľad všetkých príkazov (obnoviť vyrovnávaciu pamäť(buffer))"
+msgstr "Otvorte prehľad všetkých príkazov (obnoviť vyrovnávaciu pamäť(buffer))"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
@@ -5811,5 +5837,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
@@ -5888,17 +5914,15 @@
 #, 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 ""
 "<html> Nemôžete ukončiť zlučovanie v tomto konflikte.<br>Vyriešenie "
-"konfliktu nemôže byť aplikované pokiaľ všetky rozdiely<br>nebudú "
-"vyriešené.<br>Kliknite <strong>{0}</strong> ak chcete aj tak "
-"ukončiť.<strong> Už<br> vyriešené rozdiely nebudú "
-"použité.</strong><br>Kliknite <strong>{1}</strong> pre návrat k riešeniu "
-"konfliktov.</html>"
+"konfliktu nemôže byť aplikované pokiaľ všetky rozdiely<br>nebudú vyriešené."
+"<br>Kliknite <strong>{0}</strong> ak chcete aj tak ukončiť.<strong> Už<br> "
+"vyriešené rozdiely nebudú použité.</strong><br>Kliknite <strong>{1}</strong> "
+"pre návrat k riešeniu konfliktov.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
@@ -5920,5 +5944,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
@@ -5926,5 +5950,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 "Pridať"
@@ -5973,5 +5997,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 "História"
@@ -6191,10 +6215,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 "Vybrať v obsahu relácie"
 
 #: ../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 "Vybrať reláciu v obsahu relácií."
@@ -6356,6 +6380,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:450
 msgid "Updates the selected changesets with current data from the OSM server"
-msgstr ""
-"Aktualizovať vybraté zmenové súbory s aktuálnymi dátami z OSM servera"
+msgstr "Aktualizovať vybraté zmenové súbory s aktuálnymi dátami z OSM servera"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:475
@@ -7590,6 +7613,5 @@
 #, java-format
 msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr ""
-"Nemožno omedziť požiadavku na zmenový súbor na nemo užívateľa ''{0}''"
+msgstr "Nemožno omedziť požiadavku na zmenový súbor na nemo užívateľa ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
@@ -7697,9 +7719,9 @@
 #, 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>"
-msgstr ""
-"Prosím vložte dátum v obvyklom formáte pre vašu lokalitu.<br>Napríklad: "
-"{0}<br>Napríklad: {1}<br>Napríklad: {2}<br>Napríklad: {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 ""
+"Prosím vložte dátum v obvyklom formáte pre vašu lokalitu.<br>Napríklad: {0}"
+"<br>Napríklad: {1}<br>Napríklad: {2}<br>Napríklad: {3}<br>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1127
@@ -7726,13 +7748,13 @@
 #: ../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>"
-msgstr ""
-"<html>Prosím vyberte jednu z nasledujúcich <strong>štandardných "
-"otázok</strong>.Vybrať <strong>Stiahnuť iba moje zmenové súbory</strong> ak "
-"chcete stiahnuť iba zmenové súbory vytvorené vami.<br>Všimnite si, že JOSM "
-"stiahne max. 100 zmenových súborov.</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 ""
+"<html>Prosím vyberte jednu z nasledujúcich <strong>štandardných otázok</"
+"strong>.Vybrať <strong>Stiahnuť iba moje zmenové súbory</strong> ak chcete "
+"stiahnuť iba zmenové súbory vytvorené vami.<br>Všimnite si, že JOSM stiahne "
+"max. 100 zmenových súborov.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:147
@@ -7860,9 +7882,9 @@
 msgstr "Táto požiadavka URL na zmenové súbory je chybná"
 
-#: ../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 "Pridať vlastnosti"
 
-#: ../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."
@@ -7872,23 +7894,23 @@
 msgstr[2] "Toto chce zmeniť {0} objektov."
 
-#: ../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 "Prázdna hodnota vymaže tag."
 
-#: ../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 "<rôzne>"
 
-#: ../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 "Zmeniť hodnoty ?"
 
-#: ../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"
@@ -7898,5 +7920,5 @@
 msgstr[2] "Zmeniť vlastnosti až {0} objektov."
 
-#: ../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."
@@ -7906,77 +7928,77 @@
 msgstr[2] "Toto zmení až {0} objekty."
 
-#: ../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 "Vyberte prosím kľúč"
 
-#: ../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 "Vyberte prosím hodnotu"
 
-#: ../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 "Vyberte prosím objekty, ktorým chcete zmeniť vlastnosti."
 
-#: ../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 "Vlastnosti/Členstvo(memberships)"
 
-#: ../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 "Vlastnosti pre zvolené objekty"
 
 #. 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 "Člen"
 
-#: ../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
+msgstr "Poloha"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:940
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Vlastnosti: {0} / Memberships: {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 "Vlastnosti / Memberships"
 
-#: ../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 "Zmeniť reláciu"
 
-#: ../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 "Zmazať z relácie (zo vzťahu"
 
-#: ../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 "Naozaj zmazať výber z relacie {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 "Zmaže zvolený klúč vo všetkých objektoch"
 
-#: ../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 "Zmazať vlastnosti"
 
-#: ../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 "Pridať nový kľúč/hodnota pár k všetkým objektom."
 
-#: ../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 "Zmeniť hodnotu zvoleného klúča pre všetky objekty"
 
-#: ../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 "Vybrať reláciu"
 
-#: ../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 "Vybrať reláciu v hlavnom výbere."
@@ -8044,6 +8066,5 @@
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-"Varovanie: ignorujem výnimku pretože úloha bola ukončená. Výnimka: {0}"
+msgstr "Varovanie: ignorujem výnimku pretože úloha bola ukončená. Výnimka: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:93
@@ -8099,6 +8120,6 @@
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
-"relation itself.<br>This creates circular dependencies and is "
-"discouraged.<br>How do you want to proceed with circular dependencies?</html>"
+"relation itself.<br>This creates circular dependencies and is discouraged."
+"<br>How do you want to proceed with circular dependencies?</html>"
 msgstr ""
 "<html>Je tam aspoň jeden člen odkazujúci na túto reláciu<br>na vlastnú "
@@ -8119,10 +8140,10 @@
 msgid ""
 "<html>This relation already has one or more members referring to<br>the "
-"primitive ''{0}''<br><br>Do you really want to add another relation "
-"member?</html>"
+"primitive ''{0}''<br><br>Do you really want to add another relation member?</"
+"html>"
 msgstr ""
 "<html>Táto relácia už má jedného alebo viac členov odkazujúcich "
-"na<br>pôvodné ''{0}''<br><br>Skutočne chcete pridať ďalšieho relačného "
-"člena?</html>"
+"na<br>pôvodné ''{0}''<br><br>Skutočne chcete pridať ďalšieho relačného člena?"
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612
@@ -8170,6 +8191,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790
 msgid "Remove all members referring to one of the selected primitives"
-msgstr ""
-"Odstrániť všetky členy odkazujúce na jeden zo selektovaných pôvodných"
+msgstr "Odstrániť všetky členy odkazujúce na jeden zo selektovaných pôvodných"
 
 #. putValue(NAME, tr("Remove Selected"));
@@ -8287,13 +8307,12 @@
 msgstr ""
 "<html>Táto relácia bola zmenená zvonku z editoru.<br>Nemôžete použiť zmeny "
-"pokračovať v editácii.<br><br>Chcete vyriešiť konflikt a zavrieť "
-"editor?</html>"
+"pokračovať v editácii.<br><br>Chcete vyriešiť konflikt a zavrieť editor?</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
 #, java-format
 msgid ""
-"<html>Layer ''{0}'' already has a conflict for "
-"primitive<br>''{1}''.<br>Please resolve this conflict first, then try "
-"again.</html>"
+"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
+"<br>Please resolve this conflict first, then try again.</html>"
 msgstr ""
 "<html>Vrstva ''{0}'' už mala konflikt pre pôvodné<br>''{1}''.<br>Prosím "
@@ -8413,6 +8432,5 @@
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-"Varovanie: ignorujem výnimku pretože úloha bola ukončená. Výnimka: {0}"
+msgstr "Varovanie: ignorujem výnimku pretože úloha bola ukončená. Výnimka: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
@@ -8640,11 +8658,10 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is "
-"enabled.<br>Please chose to either download OSM data, or GPX data, or "
-"both.</html>"
-msgstr ""
-"<html>Žiadny <strong>{0}</strong> ani <strong>{1}</strong> je "
-"umožnený.<br>Prosím vybrať pre jedny sťahované OSM dáta, alebo GPX dáta, "
-"alebo oba.</html>"
+"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
+"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
+msgstr ""
+"<html>Žiadny <strong>{0}</strong> ani <strong>{1}</strong> je umožnený."
+"<br>Prosím vybrať pre jedny sťahované OSM dáta, alebo GPX dáta, alebo oba.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
@@ -8784,14 +8801,14 @@
 "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>"
-msgstr ""
-"<html><p class=\"warning-header\">Obsah pomoci pre chýbajúcu tému "
-"pomoci</p><p class=\"warning-body\"> Obsah pomoci pre tému pomoci "
-"<strong>{0}</strong> nie je už dostupná. Je to chýbajúce v oboch vašich "
-"miestnych jazykoch ({1}) a aj v angličtine.<br><br>Pomôžte prosím pri "
-"zlepšení systému pomoci JOSMu a doplňte chýbajúce informácie. Oboje môžete "
-"upraviť pre <a href=\"{2}\">tému pomoci vo vašom miestnom jazyku ({1})</a> a "
-"v <a href=\"{3}\">táme pomoci v angličtine</a>.</p></html>"
+"your local language ({1})</a> and the <a href=\"{3}\">help topic in english</"
+"a>.</p></html>"
+msgstr ""
+"<html><p class=\"warning-header\">Obsah pomoci pre chýbajúcu tému pomoci</"
+"p><p class=\"warning-body\"> Obsah pomoci pre tému pomoci <strong>{0}</"
+"strong> nie je už dostupná. Je to chýbajúce v oboch vašich miestnych "
+"jazykoch ({1}) a aj v angličtine.<br><br>Pomôžte prosím pri zlepšení systému "
+"pomoci JOSMu a doplňte chýbajúce informácie. Oboje môžete upraviť pre <a "
+"href=\"{2}\">tému pomoci vo vašom miestnom jazyku ({1})</a> a v <a href=\"{3}"
+"\">táme pomoci v angličtine</a>.</p></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
@@ -8800,11 +8817,11 @@
 "<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 ""
 "<html><p class=\"error-header\">Nastala chyba pri získavaní  informácií "
 "pomoci</p><p class=\"error-body\">Obsah pre tému pomoci <strong>{0}</strong> "
-"nemohol byť nahratý. Chybová správa je "
-"(nepreložená):<br><tt>{1}</tt></p></html>"
+"nemohol byť nahratý. Chybová správa je (nepreložená):<br><tt>{1}</tt></p></"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355
@@ -8933,6 +8950,5 @@
 "Failed to set current primitive. Current version {0} not available in "
 "history."
-msgstr ""
-"chybná zadanie pôvodných. aktuálna verzia {0} nie je platná v priebehu"
+msgstr "chybná zadanie pôvodných. aktuálna verzia {0} nie je platná v priebehu"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:55
@@ -8998,6 +9014,6 @@
 "<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
 msgstr ""
-"<html>Verzia <strong>{0}</strong> aktuálne upravovaná vo vrstve "
-"''{1}''</html>"
+"<html>Verzia <strong>{0}</strong> aktuálne upravovaná vo vrstve ''{1}''</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:98
@@ -9092,16 +9108,15 @@
 "version of one<br>of your nodes, ways, or relations.<br>The conflict is "
 "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click "
-"<strong>{4}</strong> to synchronize the conflicting primitive only.<br>Click "
-"<strong>{5}</strong> to synchronize the entire local dataset with the "
-"server.<br>Click <strong>{6}</strong> to abort and continue "
-"editing.<br></html>"
+"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
+"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
+"strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{6}</strong> to abort and continue editing.<br></html>"
 msgstr ""
 "<html>Aktualizácia <strong>neúspešná</strong> pretože server ná novú verziu "
 "jednu z<br>vaších bodov, ciest, alebo relácií.<br>Konflikt je zapríčinený "
-"<strong>{0}</strong> s id <strong>{1}</strong>,<br> server má verziu "
-"{2},vaša verzia je {3}.<br><br>Click <strong>{4}</strong> pre synchronizáciu "
-"iba sporných  pôvodných.<br>Click <strong>{5}</strong> pre synchronizáciu "
-"celej lokálnej dátovej sady so serverom.<br>Click <strong>{6}</strong> pre "
+"<strong>{0}</strong> s id <strong>{1}</strong>,<br> server má verziu {2},"
+"vaša verzia je {3}.<br><br>Click <strong>{4}</strong> pre synchronizáciu iba "
+"sporných  pôvodných.<br>Click <strong>{5}</strong> pre synchronizáciu celej "
+"lokálnej dátovej sady so serverom.<br>Click <strong>{6}</strong> pre "
 "zrušenie a pokračovanie v editácii.<br></html>"
 
@@ -9116,14 +9131,12 @@
 msgid ""
 "<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click "
-"<strong>{0}</strong> to synchronize the entire local dataset with the "
-"server.<br>Click <strong>{1}</strong> to abort and continue "
-"editing.<br></html>"
+"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
+"</strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{1}</strong> to abort and continue editing.<br></html>"
 msgstr ""
 "<html>Nahrávanie <strong>neúspešné</strong> pretože server má novú verziu "
-"jednu z <br>vašich bodov,ciest, alebo relácií.<br><br>Click "
-"<strong>{0}</strong>pre synchronizáciu celej lokálnej dátovej sady so "
-"serverom.<br>Click <strong>{1}</strong> pre zrušenie a pokračovanie v "
-"editácii.<br></html>"
+"jednu z <br>vašich bodov,ciest, alebo relácií.<br><br>Click <strong>{0}</"
+"strong>pre synchronizáciu celej lokálnej dátovej sady so serverom.<br>Click "
+"<strong>{1}</strong> pre zrušenie a pokračovanie v editácii.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194
@@ -9392,5 +9405,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 "Nie"
@@ -9398,6 +9411,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 "Vrstva ''{0}'' obsahuje zmeny ktoré, by mali byť nahraté na server."
 
@@ -9491,18 +9503,18 @@
 msgid_plural ""
 "<html>{0} layers need saving but have no associated file.<br>Either select a "
-"file for each of them or discard the changes.<br>Layers without a "
-"file:</html>"
+"file for each of them or discard the changes.<br>Layers without a file:</"
+"html>"
 msgstr[0] ""
-"<html>{0} vrstvy sa musia uložiť, pretože nemajú pričlenené "
-"súbory.<br>Najskôr vyberte súbory pre tieto vrstvy, alebo zrušte "
-"zmeny.<br>Vrstvy bez súborov:</html>"
+"<html>{0} vrstvy sa musia uložiť, pretože nemajú pričlenené súbory."
+"<br>Najskôr vyberte súbory pre tieto vrstvy, alebo zrušte zmeny.<br>Vrstvy "
+"bez súborov:</html>"
 msgstr[1] ""
 "<html>{0} vrstva sa musí uložiť, pretože nemá  pričlenený súbor.<br>Najskôr "
-"vyberte súbor pre túto vrstvu, alebo zrušte zmeny.<br>Vrstva bez "
-"súboru:</html>"
+"vyberte súbor pre túto vrstvu, alebo zrušte zmeny.<br>Vrstva bez súboru:</"
+"html>"
 msgstr[2] ""
-"<html>{0} vrstiev sa musí uložiť, pretože nemajú pričlenené "
-"súbory.<br>Najskôr vyberte súbory pre tieto vrstvy, alebo zrušte "
-"zmeny.<br>Vrstvy bez súborov:</html>"
+"<html>{0} vrstiev sa musí uložiť, pretože nemajú pričlenené súbory."
+"<br>Najskôr vyberte súbory pre tieto vrstvy, alebo zrušte zmeny.<br>Vrstvy "
+"bez súborov:</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
@@ -9514,6 +9526,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 "
@@ -9563,6 +9575,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
-msgstr ""
-"Ukončiť JOSM s uložením. Neuložené zmeny budú nahrané a/alebo uložené"
+msgstr "Ukončiť JOSM s uložením. Neuložené zmeny budú nahrané a/alebo uložené"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
@@ -9572,6 +9583,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
-msgstr ""
-"Uložiť/Nahrať vrstvy pred vymazaním. Neuložené zmeny nebudú stratené."
+msgstr "Uložiť/Nahrať vrstvy pred vymazaním. Neuložené zmeny nebudú stratené."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
@@ -9735,6 +9745,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
 msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr ""
-"Prosím zapíšte poznámku pre toto nahratie zmenovej sady (min. 3 znaky)"
+msgstr "Prosím zapíšte poznámku pre toto nahratie zmenovej sady (min. 3 znaky)"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
@@ -9760,5 +9769,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9788,6 +9797,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 "Zmenový súbor bude <strong>zavretý</strong> po tomto nahratí"
 
@@ -9807,12 +9815,12 @@
 "Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong>"
 msgstr[0] ""
-"Nahrávanie <strong>{0} objektu</strong> do <strong>1 zmenového "
-"súboru</strong>"
+"Nahrávanie <strong>{0} objektu</strong> do <strong>1 zmenového súboru</"
+"strong>"
 msgstr[1] ""
-"Nahrávanie <strong>{0} objektov</strong> do <strong>1 zmenového "
-"súboru</strong>"
+"Nahrávanie <strong>{0} objektov</strong> do <strong>1 zmenového súboru</"
+"strong>"
 msgstr[2] ""
-"Nahrávanie <strong>{0} objektov</strong> do <strong>1 zmenového "
-"súboru</strong>"
+"Nahrávanie <strong>{0} objektov</strong> do <strong>1 zmenového súboru</"
+"strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:87
@@ -9825,12 +9833,12 @@
 "<strong>1 request</strong>"
 msgstr[0] ""
-"Nahrávanie <strong>{0} objektu</strong> do <strong>1 zmenového "
-"súboru</strong> použitím <strong>1 požiadavky</strong>"
+"Nahrávanie <strong>{0} objektu</strong> do <strong>1 zmenového súboru</"
+"strong> použitím <strong>1 požiadavky</strong>"
 msgstr[1] ""
-"Nahrávanie <strong>{0} objektov</strong> do <strong>1 zmenového "
-"súboru</strong> použitím <strong>1 požiadavky</strong>"
+"Nahrávanie <strong>{0} objektov</strong> do <strong>1 zmenového súboru</"
+"strong> použitím <strong>1 požiadavky</strong>"
 msgstr[2] ""
-"Nahrávanie <strong>{0} objektov</strong> do <strong>1 zmenového "
-"súboru</strong> použitím <strong>1 požiadavky</strong>"
+"Nahrávanie <strong>{0} objektov</strong> do <strong>1 zmenového súboru</"
+"strong> použitím <strong>1 požiadavky</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:92
@@ -9840,6 +9848,6 @@
 "<strong>{1} requests</strong>"
 msgstr ""
-"Nahrávanie <strong>{0} objektov</strong> do <strong>1 zmenového "
-"súboru</strong> použitím <strong>{1} požiadavky</strong>"
+"Nahrávanie <strong>{0} objektov</strong> do <strong>1 zmenového súboru</"
+"strong> použitím <strong>{1} požiadavky</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:94
@@ -9856,13 +9864,12 @@
 msgstr ""
 "{0} objekty prektočili max. povolených {1} objektov v zmenovom súbore na "
-"server ''{2}''. Prosím <a href=\"urn:advanced-"
-"configuration\">konfigurujte</a> ako postupovať s <strong>viacnásobnými "
-"zmenovými súbormi</strong>"
+"server ''{2}''. Prosím <a href=\"urn:advanced-configuration\">konfigurujte</"
+"a> ako postupovať s <strong>viacnásobnými zmenovými súbormi</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:101
 #, 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 ""
 "Nahrávanie <strong>{0} objektov</strong> do <strong>viacnásobných zmenových "
@@ -9923,7 +9930,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 ""
 "Kliknutím ''<strong>{0}</strong>'' bude pokračovať nahrávanie do ďalších "
@@ -9937,5 +9944,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9953,5 +9960,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..."
@@ -9963,6 +9970,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 ""
 "Ignorujem zachytenú výnimku pretože nahrávanie je zrušené. Výnimka je: {0}"
@@ -10034,6 +10040,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323
 msgid "Upload in one request not possible (too many objects to upload)"
-msgstr ""
-"Nedá sa nahrať v jednej požiadavke (príliš veľa objektov na nahratie)"
+msgstr "Nedá sa nahrať v jednej požiadavke (príliš veľa objektov na nahratie)"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324
@@ -10199,7 +10204,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 ""
 "<html>Údaje v GPX vrstve ''{0}'' boli stiahnuté zo servera.<br>Pretože body "
@@ -10227,7 +10232,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 ""
 "<html>Údaje v GPX vrstve ''{0}'' boli stiahnuté zo servera.<br>Pretože body "
@@ -10296,6 +10301,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 ""
 "<html>Nahrať nespracované GPS dáta, ako mapové dáta je nežiadúce.<br>K "
@@ -10362,6 +10367,6 @@
 "wish<br>to continue?</html>"
 msgstr ""
-"<html>Táto akcia bude potrebovať<br>{0} samostatných stiahnutí "
-"dát.<br>Chcete pokračovať?</html>"
+"<html>Táto akcia bude potrebovať<br>{0} samostatných stiahnutí dát."
+"<br>Chcete pokračovať?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
@@ -10495,6 +10500,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 ""
 "<html>Nahrať z nerozdelených GPS dát ako mapových dát je nepremyslene "
@@ -10561,11 +10566,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
 msgid ""
-"<html>Take a photo of your GPS receiver while it displays the "
-"time.<br>Display that photo here.<br>And then, simply capture the time you "
-"read on the photo and select a timezone<hr></html>"
-msgstr ""
-"<html>Urobte fotku Vášho GPS zariadenia keď ukazuje čas.<br>Zobrazte "
-"fotku.<br>Potom len zapíšte čas ktorý vidíte na fotke a vyberte časovú zónu. "
-"<hr></html>"
+"<html>Take a photo of your GPS receiver while it displays the time."
+"<br>Display that photo here.<br>And then, simply capture the time you read "
+"on the photo and select a timezone<hr></html>"
+msgstr ""
+"<html>Urobte fotku Vášho GPS zariadenia keď ukazuje čas.<br>Zobrazte fotku."
+"<br>Potom len zapíšte čas ktorý vidíte na fotke a vyberte časovú zónu. <hr></"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
@@ -10626,6 +10631,6 @@
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
-"<html>Použite fotografiu z presných hodiniek,<br>e.g. displej GPS "
-"prístroja</html>"
+"<html>Použite fotografiu z presných hodiniek,<br>e.g. displej GPS prístroja</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
@@ -10635,5 +10640,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
 msgid "Matches first photo with first gpx point"
-msgstr ""
+msgstr "Spárovať prvú fotografiu s prvým bodom GPX"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
@@ -11060,6 +11065,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
 msgid "There was an error while trying to display the URL for this marker"
-msgstr ""
-"Bola tam nejaká chyba zatiaľ čo skúšate zobraziť URL pre tieto značky"
+msgstr "Bola tam nejaká chyba zatiaľ čo skúšate zobraziť URL pre tieto značky"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
@@ -11077,6 +11081,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:135
 msgid "Illegal dash pattern, at least one value must be > 0"
-msgstr ""
-"Nesprávna kresba prerušovanej čiary, aspoň jedna hodnota musí byť > 0"
+msgstr "Nesprávna kresba prerušovanej čiary, aspoň jedna hodnota musí byť > 0"
 
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:102
@@ -11116,7 +11119,7 @@
 "to use the Access Token in this JOSM session only.</html>"
 msgstr ""
-"<html>Vybrať na uloženie autorizačný prístup v JOSM "
-"nastaveniach.<br>Pozastaviť používanie autorizačného prístupu iba v tomto "
-"spustení programu JOSM.</html>"
+"<html>Vybrať na uloženie autorizačný prístup v JOSM nastaveniach."
+"<br>Pozastaviť používanie autorizačného prístupu iba v tomto spustení "
+"programu JOSM.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
@@ -11181,6 +11184,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 ""
 "<html> Spustiť plne automatický postup na získanie autorizačného prístupu z "
@@ -11213,8 +11216,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 ""
 "Prosím, zadajte svoje OSM užívateľské meno a heslo. Heslo <strong> nebude </ "
@@ -11347,7 +11350,6 @@
 "<html>Automatický proces pre získanie OAuth autorizačného prístupu<br>z OSM "
 "servera prebehol neúspešne pretože JOSM nie je schopný vytvoriť<br>platné "
-"URL prihlásenie z OAuth autorizačným URL koncovým bodom "
-"''{0}''.<br><br>Skontrolujte prosím vaše rozšírené nastavenia a skúste "
-"znovu.</html>"
+"URL prihlásenie z OAuth autorizačným URL koncovým bodom ''{0}''."
+"<br><br>Skontrolujte prosím vaše rozšírené nastavenia a skúste znovu.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:490
@@ -11355,11 +11357,11 @@
 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 ""
 "<html>Automatický proces pre získanie OAuth autorizačného prístupu<br>z OSM "
 "servera prebehol neúspešne. JOSM neúspešne vstúpil do záznamu {0}<br>pre "
-"užívateľa {1}.<br><br>Skontrolujte meno a heslo užívateľa a skúste "
-"znovu.</html>"
+"užívateľa {1}.<br><br>Skontrolujte meno a heslo užívateľa a skúste znovu.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:58
@@ -11478,6 +11480,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 ""
 "Nepodarilo sa overiť užívateľa ''{0}'' s heslom''***'' ako užívateľa OAuth"
@@ -11518,6 +11519,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
 msgid "Select to grant JOSM the right to upload map data on your behalf"
-msgstr ""
-"Zvoľte udelenie programu JOSM právo vkladať mapové dáta vo vašom mene"
+msgstr "Zvoľte udelenie programu JOSM právo vkladať mapové dáta vo vašom mene"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
@@ -11555,6 +11555,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
 msgid "Select to grant JOSM the right to write your server preferences"
-msgstr ""
-"Zvoľte udelenie programu JOSM právo zapisovať vaše nastavenia servera"
+msgstr "Zvoľte udelenie programu JOSM právo zapisovať vaše nastavenia servera"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
@@ -11580,6 +11579,5 @@
 #, java-format
 msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
-msgstr ""
-"<html> Získavanie OAuth žiadosti prístupu z ''{0}'' zlyhalo. </ html>"
+msgstr "<html> Získavanie OAuth žiadosti prístupu z ''{0}'' zlyhalo. </ html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:130
@@ -11620,8 +11618,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 ""
 "<html> JOSM úspešne získal žiadosť prístupu. JOSM teraz spúšťa registračnú "
@@ -11724,8 +11722,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 ""
 "<html>  Autorizovaný prístup ''{1}'' je známy, pre server OSM ''{0}''.< br> "
@@ -11763,7 +11761,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 ""
 "<html> Test sa nepodaril, pretože server odpovedal s internou chybou. <br> "
@@ -11817,5 +11815,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 "Prosím vyberte riadok na odstránenie."
@@ -12137,5 +12135,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Create markers when reading GPX."
-msgstr ""
+msgstr "Vytvorenie markerov pri čítaní GPX."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
@@ -12187,6 +12185,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 ""
 "Nakreslite smerové šípky použijúc vyhľadávajúcu tabuľku namiesto "
@@ -12253,6 +12250,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 ""
 "Aplikovať vyhladzovanie (antialiasing) v mape pre jemnejšie zobrazenie."
@@ -12266,6 +12262,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
 msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr ""
-"Kresliť virtuálne body v režme výberu, pre zjednodušenie modifikácie."
+msgstr "Kresliť virtuálne body v režme výberu, pre zjednodušenie modifikácie."
 
 #. background layers in inactive color
@@ -12326,5 +12321,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 "Povoliť vstavané východzie hodnoty"
@@ -12344,6 +12339,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>:"
@@ -12478,6 +12472,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 ""
 "<p>Ďalej sú klávesové skratky aktivované, keď sú činnosti najskôr pridelené "
@@ -12494,9 +12488,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 ""
 "<p> Môžete si všimnúť, že vo výberovom zozname kľúčov na nasledujúcej strane "
@@ -12809,6 +12803,6 @@
 #, java-format
 msgid ""
-"<html>Failed to load the list of style sources "
-"from<br>''{0}''.<br><br>Details (untranslated):<br>{1}</html>"
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
 msgstr ""
 "<html>Neúspešné načítanie obsahu zdrojov štýlov z<br>''{0}''.<br><br>Detaily "
@@ -12822,5 +12816,5 @@
 "Varovanie: neplatný formát počtu v štýle obsahu ''{0}''. Dostal som ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #, java-format
 msgid ""
@@ -12830,18 +12824,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 ""
@@ -12850,5 +12844,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 ""
@@ -12857,5 +12851,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 ""
@@ -12864,9 +12858,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 "Menu Sort presets"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
 msgid "Tagging Presets"
 msgstr "Predvoľby značenia (Tagging Presets)"
@@ -12983,6 +12977,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 ""
 "<html> Nepodarilo sa doplniť URL ''{0}'' pre overenie OSM API servera. <br> "
@@ -13008,6 +13002,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 ""
 "<html>Neúspešné získanie zoznamu zmenových súborov z OSM API servera "
@@ -13101,6 +13095,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 ""
 "Varovanie: Nepodarilo sa získať OAuth autorizovaný prístup z poverovacieho "
@@ -13122,8 +13115,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:226
-msgid ""
-"You already have an Access Token to access the OSM server using OAuth."
-msgstr ""
-"Už máte autorizovaný prístup pre prístup k OSM serveru pomocou OAuth."
+msgid "You already have an Access Token to access the OSM server using OAuth."
+msgstr "Už máte autorizovaný prístup pre prístup k OSM serveru pomocou OAuth."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:258
@@ -13222,9 +13213,9 @@
 #: ../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)"
-msgstr ""
-"Použite štandardné nastavenia systému (vypnuté. Štart JOSM s <tt>-"
-"Djava.net.useSystemProxies = true </ tt>, pre zapnutie)"
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+"Použite štandardné nastavenia systému (vypnuté. Štart JOSM s <tt>-Djava.net."
+"useSystemProxies = true </ tt>, pre zapnutie)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:256
@@ -13287,17 +13278,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 msgid "Available roles"
-msgstr ""
+msgstr "Dostupné úlohy"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564
 msgid "role"
-msgstr ""
+msgstr "úlohy"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565
 msgid "count"
-msgstr ""
+msgstr "počet"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566
 msgid "elements"
-msgstr ""
+msgstr "prvky"
 
 #. space
@@ -13363,4 +13354,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 "Zmeniť vlastnosti"
@@ -13472,6 +13464,6 @@
 msgid "Unexpected value for ''{0}'' in changeset query url, got {1}"
 msgstr ""
-"Neočakávaná hodnota pre ''{0}'' v URL požiadavke zmevého súboru, dostal "
-"som{1}"
+"Neočakávaná hodnota pre ''{0}'' v URL požiadavke zmevého súboru, dostal som"
+"{1}"
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:362
@@ -13487,6 +13479,5 @@
 #, java-format
 msgid "Unsupported parameter ''{0}'' in changeset query string"
-msgstr ""
-"Nepodporovaný parameter ''{0}''  v reťazci požiadavky zmenového súboru"
+msgstr "Nepodporovaný parameter ''{0}''  v reťazci požiadavky zmenového súboru"
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
@@ -13543,5 +13534,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
@@ -13565,5 +13556,5 @@
 msgstr "Spracovávam odpoveď  servera ..."
 
-#: ../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}''"
@@ -13734,6 +13725,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 ""
 "Žiadne pôvodné s id {0}  v miestnom dátovom súbore. Nemožno vyvodzovať "
@@ -13859,10 +13849,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 "neočakávaný formát z id odpovedi zo servera, dostáva ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:278
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -13872,69 +13862,69 @@
 "''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
 msgid "Creating changeset..."
 msgstr "Vytváranie súboru zmien..."
 
-#: ../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 "Úspešne otvorený súbor zmien {0}"
 
-#: ../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 "Zmenový súbor id > 0 očekávaný. Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349
 msgid "Updating changeset..."
 msgstr "Aktualizácia súboru zmien..."
 
-#: ../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 "Aktualizácia súboru zmien {0}..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:388
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389
 msgid "Closing changeset..."
 msgstr "Zatváranie súboru zmien..."
 
-#: ../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 "Nenachádza sa tu súbor zmien pre diff nahratie"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
 msgid "Preparing upload request..."
 msgstr "Pripravujem požiadavku pre nahrávanie ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447
 msgid "Waiting 10 seconds ... "
 msgstr "Čakanie 10 sekúnd ... "
 
-#: ../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 "Začiatok opakovania {0} z {1} v {2} sekunde ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:458
 msgid "OK - trying again."
 msgstr "OK - skúšam znovu."
 
-#: ../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 "Spúšťam opakovanie {0} z {1}."
 
-#: ../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 "Aktuálny zmenový súbor je prázdny. Nemožem nahrať dáta."
 
-#: ../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 "ID z aktuálneho zmenového súboru > 0 požadovaný. Aktuálne ID je {0}."
 
-#: ../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}."
@@ -14118,6 +14108,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
 msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
-msgstr ""
-"Nepodarilo sa podpísať HTTP spojenie s hlavičkou OAuth autentifikácie"
+msgstr "Nepodarilo sa podpísať HTTP spojenie s hlavičkou OAuth autentifikácie"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
@@ -14128,4 +14117,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})"
@@ -14146,9 +14136,9 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error "
-"is:<br>{0}</html>"
-msgstr ""
-"<html>Nejaká chyba nastala počas obnovy záložného súboru.<br>Chyba je: "
-"<br>{0}</html>"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
+"html>"
+msgstr ""
+"<html>Nejaká chyba nastala počas obnovy záložného súboru.<br>Chyba je: <br>"
+"{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
@@ -14175,9 +14165,9 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
-msgstr ""
-"Chýbajúce povinné vlastnosti pri prvku ''hranice''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+msgstr ""
+"Chýbajúce povinné vlastnosti pri prvku ''hranice''. Got minlon=''{0}'',"
+"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
@@ -14220,6 +14210,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 ""
 "Neplatná hodnota pre vlastnosť ''ref'' pre člena v relácii {0}. Got {1}"
@@ -14695,6 +14684,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 ""
 "<html> Plugin {0} vyžaduje verziu JOSM {1}. Súčasná verzia JOSM je {2}. <br> "
@@ -14925,6 +14914,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 ""
 "Upozornenie: Nepodaril sa scan súboru ''{0}'' pre informácie o pluginoch. "
@@ -14990,5 +14978,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:343
 msgid "unspecified reason"
-msgstr ""
+msgstr "nešpecifikovaný dôvod"
 
 #: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:348
@@ -14997,5 +14985,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"
@@ -15069,7 +15057,7 @@
 "the server URL in your preferences and your internet connection.</html>"
 msgstr ""
-"<html>Neúspešná inicializácia komunikácie s OSM serverom "
-"{0}.<br>Skontrojujte URL servera vo vašich nastaveniach a vo vašom "
-"internetovom pripojení.</html>"
+"<html>Neúspešná inicializácia komunikácie s OSM serverom {0}."
+"<br>Skontrojujte URL servera vo vašich nastaveniach a vo vašom internetovom "
+"pripojení.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
@@ -15101,17 +15089,17 @@
 msgid ""
 "<html>Uploading to the server <strong>failed</strong> because your "
-"current<br>dataset violates a precondition.<br>The error message "
-"is:<br>{0}</html>"
+"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
+"html>"
 msgstr ""
 "<html>Aktualizácia na server <strong>neuspešná</strong> pretože vaša "
-"aktuálna<br>dátová sada nespĺňa predpoklad.<br>Chybová správa "
-"je:<br>{0}</html>"
+"aktuálna<br>dátová sada nespĺňa predpoklad.<br>Chybová správa je:<br>{0}</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:113
 #, 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 ""
 "<html>Overenie na OSM serveri s používateľským menom ''{0}'' zlyhalo. <br> "
@@ -15122,7 +15110,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 ""
 "<html>Overenie na OSM serveri s OAuth prístupom ''{0}'' zlyhal. <br> Prosím "
@@ -15132,8 +15120,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 ""
 "<html>Overenie na serveri OSM s OAuth prístupom ''{0}'' zlyhalo. <br>Pre "
@@ -15158,7 +15146,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 ""
 "<html>Spojenie s OSM serverom ''{0}'' zlyhalo. Server odpovedal <br> "
@@ -15225,7 +15213,6 @@
 "check your internet connection.</html>"
 msgstr ""
-"<html>Neúspešné otváranie a pripájanie na  vzdialený "
-"server<br>''{0}''.<br>Prosím, skontrolujte vaše internetové "
-"pripojenie.</html>"
+"<html>Neúspešné otváranie a pripájanie na  vzdialený server<br>''{0}''."
+"<br>Prosím, skontrolujte vaše internetové pripojenie.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:321
@@ -15250,7 +15237,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 ""
 "<html>OSM server<br>''{0}''<br>hlási vnútornú chybu serveru.<br>Toto je "
@@ -15264,7 +15250,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 ""
 "Plocha, ktorú sa snažíte nahrať je príliš veľká, alebo vaša požiadavka bola "
@@ -15297,8 +15283,7 @@
 "preferences and your internet connection.</html>"
 msgstr ""
-"<html>Neúspešné otváranie a pripájanie na  vzdialený "
-"server<br>''{0}''.<br>Meno hostiteľa ''{1}'' nemôže byť vyriešený. "
-"<br>Prosím skontrolujte API URL vo vašich nastaveniach a vaše internetové "
-"pripojenie.</html>"
+"<html>Neúspešné otváranie a pripájanie na  vzdialený server<br>''{0}''."
+"<br>Meno hostiteľa ''{1}'' nemôže byť vyriešený. <br>Prosím skontrolujte API "
+"URL vo vašich nastaveniach a vaše internetové pripojenie.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:487
@@ -15307,11 +15292,11 @@
 "<html>The server reports that an object is deleted.<br><strong>Uploading "
 "failed</strong> if you tried to update or delete this object.<br> "
-"<strong>Downloading failed</strong> if you tried to download this "
-"object.<br><br>The error message is:<br>{0}</html>"
+"<strong>Downloading failed</strong> if you tried to download this object."
+"<br><br>The error message is:<br>{0}</html>"
 msgstr ""
 "<html>Server hlási, že objekt je zmazaný.<br><strong>Nahrávanie je "
 "neúspešné</strong> Ak ste sa snažili nahrať, alebo vymazať tento objekt.<br> "
-"<strong>Nahrávanie neúspešné</strong> ak ste sa snažili nahrať tento "
-"objekt.<br><br>Chybová správa je:<br>{0}</html>"
+"<strong>Nahrávanie neúspešné</strong> ak ste sa snažili nahrať tento objekt."
+"<br><br>Chybová správa je:<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/I18n.java:439
@@ -15738,6 +15723,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1278
 msgid "Please enter valid number for starting and ending address"
-msgstr ""
-"Prosím vložte platné číslo pre spustenie a ukončenie doplnenia adries"
+msgstr "Prosím vložte platné číslo pre spustenie a ukončenie doplnenia adries"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1296
@@ -15800,5 +15784,5 @@
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
 msgid "I''m ready!"
-msgstr ""
+msgstr "Som pripravený!"
 
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
@@ -15844,6 +15828,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>"
@@ -15870,6 +15854,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"
@@ -15907,6 +15891,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"
@@ -15922,7 +15906,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"
@@ -15973,9 +15957,29 @@
 msgstr "Počet: (Numbers:)"
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:134
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#, fuzzy
+msgid "Big buildings mode"
+msgstr "Nastaviť veľkosť budovy"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#, fuzzy
+msgid "Rotate crosshair"
+msgstr "Otočiť vpravo"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#, fuzzy
+msgid "Advanced settings"
+msgstr "Nastavenie pokročilých nastavení"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#, fuzzy
+msgid "Building tag:"
+msgstr "Budova"
+
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:234
 msgid "Cannot place building outside of the world."
 msgstr "Nemožno umiestniť budovy mimo Zeme."
 
-#: ../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"
@@ -15984,35 +15988,48 @@
 #: ../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 "Nastaviť veľkosť budovy"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:24
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
 msgid "Use Address dialog"
 msgstr "Použiť adresný dialóg"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#, fuzzy
+msgid "Auto-select building"
+msgstr "Vytvoriť budovu"
+
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
 msgid "Buildings width:"
 msgstr "Šírka budovy:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Length step:"
 msgstr "Dĺžka kroku:"
 
-#: ../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
+#, fuzzy
+msgid "Advanced..."
+msgstr "Rozšírené"
+
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:65
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 msgid "Draw buildings"
 msgstr "Kresliť budovy"
 
-#: ../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"
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:379
+#, fuzzy
+msgid "Point on the corner of the building to start drawing"
+msgstr "Bod na rohu budovy, na začiatok kreslenia"
+
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:381
+#, fuzzy
+msgid "Point on opposite end of the building"
 msgstr "Bod na opačnom konci budovy"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
-msgid "Set width of building"
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:383
+#, fuzzy
+msgid "Set width of the building"
 msgstr "Nastaviť šírku budov"
 
@@ -16204,7 +16221,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--waterway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -16214,5 +16231,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -16222,5 +16239,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -16236,5 +16253,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -16244,5 +16261,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -16250,8 +16267,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 "voda"
@@ -16273,5 +16290,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -16280,5 +16297,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -16287,5 +16304,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -16294,5 +16311,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -16301,5 +16318,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -16308,10 +16325,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 "adresa"
@@ -16340,17 +16357,14 @@
 #: ../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."
-msgstr ""
-"Špeciálny manipulant pre francúzsky kataster wms at "
-"www.cadastre.gouv.fr<BR><BR>Prosím čítajte Podmienky pre využívanie "
-"(francúzsky): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
-"l\"> "
+"A special handler of the French cadastre wms at www.cadastre.gouv."
+"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
+"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
+"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
+"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
+"by this plugin."
+msgstr ""
+"Špeciálny manipulant pre francúzsky kataster wms at www.cadastre.gouv."
+"fr<BR><BR>Prosím čítajte Podmienky pre využívanie (francúzsky): <br><a href="
+"\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html\"> "
 "http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
 "<BR>predtým, ako nahráte nejaké dáta vytvorené  týmto pluginom."
@@ -16362,6 +16376,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
-msgstr ""
-"<html>Hodnota kľúča \"zdroj\" keď je automatický zdroj zapnutý</html>"
+msgstr "<html>Hodnota kľúča \"zdroj\" keď je automatický zdroj zapnutý</html>"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106
@@ -16514,6 +16527,6 @@
 "grabbing."
 msgstr ""
-"Automaticky vyberie prvú WMS vrstvu, ak existuje viac vrstiev pri "
-"zachytávaní(grabovaní)."
+"Automaticky vyberie prvú WMS vrstvu, ak existuje viac vrstiev pri zachytávaní"
+"(grabovaní)."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81
@@ -16664,6 +16677,6 @@
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
-"Zvoľte druhý Lambert priečnik(crosspiece) pre určovanie zemepisnej "
-"polohy(georeferencing)"
+"Zvoľte druhý Lambert priečnik(crosspiece) pre určovanie zemepisnej polohy"
+"(georeferencing)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:275
@@ -16811,6 +16824,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 "Prázdna vrstva"
@@ -16999,4 +17012,52 @@
 msgstr "GPS dátová vrstva nie je vytvorená."
 
+#: ../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 "Upraviť zoo"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#, fuzzy
+msgid "Name:"
+msgstr "Názov"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#, fuzzy
+msgid "CmdLine:"
+msgstr "Súradnice:"
+
+#: ../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
+#, fuzzy, java-format
+msgid "Delete tool \"{0}\"?"
+msgstr "Vymazať bod {0}"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:74
+msgid "Are you sure?"
+msgstr "Ste si istý?"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
+#, fuzzy
+msgid "New tool..."
+msgstr "Nová funkcia"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
+#, fuzzy
+msgid "Install"
+msgstr "Priemysel"
+
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
 msgid "Position only"
@@ -17266,5 +17327,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#. 
+#.
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -17385,6 +17446,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 ""
 "Maximálny počet úsekov v každej vygenerovanej ceste. Východzia hodnota 250."
@@ -17408,11 +17468,10 @@
 #: ../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 "
+"Accuracy of Douglas-Peucker line simplification, measured in degrees."
+"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
+msgstr ""
+"Presnosť Douglas-Peucker zjednodušenia línií, je meraná v stupňoch."
+"<br>Nižšia hodnota dáva viac bodov, a väčšiu presnosť línií. Štandardne "
 "0.0003."
-msgstr ""
-"Presnosť Douglas-Peucker zjednodušenia línií, je meraná v "
-"stupňoch.<br>Nižšia hodnota dáva viac bodov, a väčšiu presnosť línií. "
-"Štandardne 0.0003."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
@@ -17728,6 +17787,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 ""
 "Hlavička obsahuje niekoľko hodnôt a nemôže byť namapovaný jednotlivý reťazec"
@@ -17842,6 +17900,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 "Máte neuložené zmeny vo vašej fronte. Prajete si ich odoslať teraz?"
 
@@ -17893,6 +17950,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 "Napíšte informáciu o polohe do hlavičky Exif nasledujúcich súborov:"
 
@@ -18259,8 +18315,8 @@
 msgstr "Vrátiť naspäť"
 
-#: ../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}"
-msgstr ""
+msgstr "Chýba zlučovaný cieľ pre {0} s id {1}"
 
 #: ../plugins/reverter/src/reverter/DataSetToCmd.java:51
@@ -18294,13 +18350,13 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:60
 msgid "Confirm"
-msgstr ""
+msgstr "Potvrdiť"
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:64
 msgid "Fetching missing primitives"
-msgstr ""
+msgstr "Sťahovanie chýbajúcich pôvodných"
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:75
 msgid "Downloading changeset"
-msgstr ""
+msgstr "Sťahovanie zmenoveho súboru"
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:98
@@ -18308,4 +18364,41 @@
 msgid "Revert changeset #{0}"
 msgstr "Vraciam zmeny zmenového súboru #{0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:78
+#, fuzzy
+msgid "Road Sign Plugin"
+msgstr "Načítavam pluginy"
+
+#: ../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 "Nemôžem načítať zdroj predvolieb značenia: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
+#, fuzzy, java-format
+msgid "Error parsing tagging preset from ''{0}'':\n"
+msgstr "Rozkladanie obsahu pluginu z webu ''{0}''"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:104
+#, fuzzy, java-format
+msgid "Sign {0}"
+msgstr "Výber: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:111
+#, fuzzy, java-format
+msgid "Additional sign {0}"
+msgstr "Pridať reláciu {0}"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -18412,4 +18505,15 @@
 msgstr "Vstup hmotnostnej hodnoty"
 
+#: ../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 "Zjednodušiť cestu"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
+#, fuzzy
+msgid "Delete unnecessary nodes from an area."
+msgstr "Zmazať nepotrebné body z cesty."
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
 msgid "Slippy Map"
@@ -18758,9 +18862,9 @@
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
 msgid "Browse"
-msgstr ""
+msgstr "Prechádzať"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
 msgid "Browse map with left button"
-msgstr ""
+msgstr "Prezerať mapu s ľavým tlačidlom"
 
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
@@ -19247,9 +19351,9 @@
 #: ../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>."
-msgstr ""
-"Vývoj pluginu zákaz odbočenia bol sponzorovaný <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 ""
+"Vývoj pluginu zákaz odbočenia bol sponzorovaný <a href=\"http://www.skobbler."
+"de\"> skobbler GmbH </ a>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:96
@@ -19307,6 +19411,6 @@
 "creating/editing a turn restriction from the current JOSM selection."
 msgstr ""
-"Prosím nastavte <strong>klávesovú skratku</strong>, ktorá spúšťa "
-"vytvorenie/editáciu zákazu obmedzenia z aktuálneho výberu v programe JOSM."
+"Prosím nastavte <strong>klávesovú skratku</strong>, ktorá spúšťa vytvorenie/"
+"editáciu zákazu obmedzenia z aktuálneho výberu v programe JOSM."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:64
@@ -19343,8 +19447,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 ""
 "Zákaz odbočenia používa OSM cestu<span class = \"object-name\">{0}</span>s "
@@ -19406,15 +19510,15 @@
 "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 ""
 "<strong>Z</strong>-cesty <span class=\"object-name\">{0}</span> a "
 "<strong>na</strong>-cestu <span class=\"object-name\">{1}</span> pripojené v "
-"bode <span class=\"object-name\">{2}</span> ale <span class=\"object-"
-"name\">{2}</span> nie je <strong>via(cez)</strong>-objekt.<br> Je odporúčané "
-"nastaviť <span class=\"object-name\">{2}</span> ako jedinečný "
-"<strong>via(cez)</strong>-objekt."
+"bode <span class=\"object-name\">{2}</span> ale <span class=\"object-name\">"
+"{2}</span> nie je <strong>via(cez)</strong>-objekt.<br> Je odporúčané "
+"nastaviť <span class=\"object-name\">{2}</span> ako jedinečný <strong>via"
+"(cez)</strong>-objekt."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:49
@@ -19431,6 +19535,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:60
 msgid "Go to Basic Editor and manually fix the list of via-objects"
-msgstr ""
-"Prejsť na Základný Editor a opraviť ručne zoznam \"via(cez)\"-objektov"
+msgstr "Prejsť na Základný Editor a opraviť ručne zoznam \"via(cez)\"-objektov"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingRestrictionTypeError.java:25
@@ -19540,6 +19643,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 ""
 "Zákaz odbočenia používa body OSM <span class=\"object-name\">{0}</span> ako "
@@ -19549,6 +19652,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 ""
 "Zákaz odbočenia používa relácie OSM <span class=\"object-name\">{0}</span> "
@@ -19569,33 +19672,33 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
 msgid "Undelete object..."
-msgstr ""
+msgstr "Obnoviť objekt..."
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
 msgid "Undelete object by id"
-msgstr ""
+msgstr "Obnoviť objekt s id"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
 msgid "Select if the data should be added into a new layer"
-msgstr ""
+msgstr "Vyberte v prípade, že údaje by mali byť pridané do novej vrstvy"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96
 msgid "Enter the ID of the object that should be undeleted"
-msgstr ""
+msgstr "Zadajte ID objektu, ktorý by mali byť obnovený"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108
 msgid "Undelete Object"
-msgstr ""
+msgstr "Obnoviť Objekt"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
 msgid "Undelete object"
-msgstr ""
+msgstr "Obnoviť Objekt"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114
 msgid "Start undeleting"
-msgstr ""
+msgstr "Spustiť obnovenie"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115
 msgid "Close dialog and cancel"
-msgstr ""
+msgstr "Zatvoriť dialóg a zrušiť"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170
@@ -20083,6 +20186,5 @@
 msgid ""
 "This test checks for ways that contain some of their nodes more than once."
-msgstr ""
-"Tento test kontroluje cesty, či neobsahujú niektorý bod viac ako raz."
+msgstr "Tento test kontroluje cesty, či neobsahujú niektorý bod viac ako raz."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:39
@@ -20094,6 +20196,5 @@
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
-msgstr ""
-"Tento test kontroluje cesty na podobnosť mien, keď môže ísť o preklep."
+msgstr "Tento test kontroluje cesty na podobnosť mien, keď môže ísť o preklep."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153
@@ -20219,11 +20320,10 @@
 #: ../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."
-msgstr ""
-"Zdroje (URL alebo názov súboru) z predstavených kontrol (pozrite "
-"http://wiki.openstreetmap.org/index.php/User:JLS/speller) alebo súbory na "
-"kontrolu značiek."
+"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
+"org/index.php/User:JLS/speller) or tag checking data files."
+msgstr ""
+"Zdroje (URL alebo názov súboru) z predstavených kontrol (pozrite http://wiki."
+"openstreetmap.org/index.php/User:JLS/speller) alebo súbory na kontrolu "
+"značiek."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
@@ -20420,9 +20520,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 "oblasť (plocha)"
@@ -20472,6 +20572,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:61
 msgid "This test checks for untagged, empty and one node ways."
-msgstr ""
-"Tento test hledá neotagované(neoznačené), prázdne a jednobodové cesty."
+msgstr "Tento test hledá neotagované(neoznačené), prázdne a jednobodové cesty."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
@@ -20520,11 +20619,148 @@
 msgstr "{0}, ..."
 
-#: ../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
+#, fuzzy, java-format
+msgid "{0} {1}% of GPS track"
+msgstr "{0} skladá sa z {1} stopy"
+
+#: ../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 "Importovať zvuk"
+
+#: ../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 "Odstrániť"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
+#, fuzzy
+msgid "removes current video from layer"
+msgstr "Odstraniť fotku z vrstvy"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
+#, fuzzy
+msgid "play/pause"
+msgstr "Prehrať/Pauza"
+
+#: ../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 "pozadie"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
+#, fuzzy
+msgid "jumps n sec back"
+msgstr "Skok späť"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "forward"
+msgstr "Vpred"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "jumps n sec forward"
+msgstr "Skok vpred"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
+#, fuzzy
+msgid "faster"
+msgstr "Rýchlejšie"
+
+#: ../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 "Pomalšie"
+
+#: ../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 "Povoľuje pridávanie značiek/bodov na aktuálnu gps pozíciu."
+
+#. 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
+#, fuzzy
+msgid "Jump length"
+msgstr "Skok tam"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#, fuzzy
+msgid "Set the length of a jump"
+msgstr "Nastaviť jazyk"
+
+#: ../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
+#, fuzzy
+msgid "Loop length"
+msgstr "Dĺžka"
+
+#: ../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
+#, fuzzy
+msgid "deinterlacing using linear interpolation"
+msgstr "Obrázkový filter interpolácie:"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:99
+#, fuzzy
+msgid "play"
+msgstr "vrstvu"
+
+#: ../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 ""
 
@@ -20591,6 +20827,6 @@
 msgid "<html>There are no ways connected to node ''{0}''. Aborting.</html>"
 msgstr ""
-"<html>Nenachádza sa tam žiadna cesta spojená s bodom ''{0}''. "
-"Prerušujem.</html>"
+"<html>Nenachádza sa tam žiadna cesta spojená s bodom ''{0}''. Prerušujem.</"
+"html>"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:169
@@ -20740,6 +20976,5 @@
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
 "settings."
-msgstr ""
-"Varovanie: Výber WMS dlaždíc zlyháva. Prosím skontrolujte nastavenie."
+msgstr "Varovanie: Výber WMS dlaždíc zlyháva. Prosím skontrolujte nastavenie."
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
@@ -20758,9 +20993,9 @@
 "Môže to viesť k zlým súradniciam."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
 msgid "Automatic downloading"
 msgstr "Automatické sťahovanie"
 
-#: ../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}''"
@@ -20768,19 +21003,19 @@
 "Varovanie: WMS vrstva je deaktivovaná, pretože je obsahuje chybnú url ''{0}''"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:105
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
 msgid "(deactivated)"
 msgstr "(deaktivované)"
 
-#: ../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 "WMS vrstva ({0}), sa automaticky sťahuje vo zväčšení (zoom) {1}"
 
-#: ../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 "WMS vrstva ({0}), sťahovaná vo zväčšení (zoom) {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
 #, java-format
 msgid ""
@@ -20792,20 +21027,20 @@
 "<html>Základ URL<br>''{0}''<br>pre túto WMS vrstvu neobsahuje na konci "
 "žiadnu z ''&'' ani s ''?''.<br>Toto pravdepodobne vedie k chybnej WMS "
-"požiadavke. Mali by ste skontrolovať vaše<br>nastavenie "
-"preferencií.<br>Chcete doniesť WMS dlaždice aj napriek tomu?"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
+"požiadavke. Mali by ste skontrolovať vaše<br>nastavenie preferencií."
+"<br>Chcete doniesť WMS dlaždice aj napriek tomu?"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Yes, fetch images"
 msgstr "Áno, stiahni obrázky"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Invalid URL?"
 msgstr "Chybná URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311
 msgid "Download visible tiles"
 msgstr "Stiahnuť viditeľné dlaždice"
 
-#: ../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"
@@ -20813,96 +21048,96 @@
 "Požadovaná oblasť je príliš veľká. Prosím priblížte ju, alebo zmente oblasť."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329
 msgid "Change resolution"
 msgstr "Zmena rozlíšenia"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341
 msgid "Reload erroneous tiles"
 msgstr "Nahrať poškodené dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365
 msgid "Alpha channel"
 msgstr "Alfa kanál"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385
 msgid "Save WMS layer to file"
 msgstr "Uložiť WMS vrstvu do súboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
 msgid "Save WMS layer"
 msgstr "Uložiť WMS vrstvu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413
 msgid "Load WMS layer from file"
 msgstr "Nahrať WMS vrstvu zo súboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
 msgid "Load WMS layer"
 msgstr "Načítať WMS vrstvu"
 
-#: ../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 "Nepodporovaná verzia WMS súboru; nájdené {0}, očakávané {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
 msgid "File Format Error"
 msgstr "Chyba formátu súboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449
 msgid "Error loading file"
 msgstr "Chyba pri nahrávaní súboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463
 msgid "Set WMS Bookmark"
 msgstr "Nastaviť WMS Záložku"
 
-#: ../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 "Otvoriť prázdnu WMS vrstvu, aby sa nahrali dáta zo súboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
 msgid "WMS Plugin Preferences"
 msgstr "Nastavenie WMS Pluginu"
 
-#: ../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 "Upraviť obsah WMS serverov zobrazených vo WMS menu pluginu"
 
-#: ../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 "Meno v menu"
 
-#: ../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 "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "Menu Name (Default)"
 msgstr "Meno v menu (východzie)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "WMS URL (Default)"
 msgstr "WMS URL (východzie)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:86
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
 msgid "Enter a menu name and WMS URL"
 msgstr "Zadajte meno v menu a WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:111
 msgid "Copy Selected Default(s)"
 msgstr "Kopírovať vybrané vychodzie nastavenia"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:118
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
 msgid "Please select at least one row to copy."
 msgstr "Prisím vyberte aspoň jeden riadok pre kopírovanie."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
 msgid "Downloader:"
 msgstr "Stahovač:"
@@ -20919,4 +21154,9 @@
 msgid "% of north:"
 msgstr "% zo severu:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186
+#, fuzzy
+msgid "Simultaneous connections"
+msgstr "Bod: Pripojený"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -20928,7 +21168,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
@@ -20981,8 +21221,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 "les"
@@ -20999,7 +21239,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--boundary tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -21009,5 +21249,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -21050,5 +21290,5 @@
 #. color boundary
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -21058,5 +21298,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -21066,5 +21306,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -21074,15 +21314,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 "hranica (boundary)"
@@ -21098,5 +21338,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -21105,7 +21345,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--route tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -21115,5 +21355,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -21123,5 +21363,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -21131,5 +21371,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -21139,5 +21379,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -21147,5 +21387,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -21155,5 +21395,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -21163,12 +21403,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 "trasa (route)"
@@ -21411,6 +21651,6 @@
 "medzi nimi. Iba zmena farieb a vytvoriť novú schému. Použiť prepínač na "
 "biele pozadie so zodpovedajúcimi farbami pre lepšiu viditeľnosť pri jasnom "
-"slnečnom svetle. Pozrieť dialóg v JOSM nastaveniach a 'Map "
-"Settings(nastavenia mapy' (divné, ale pravdivé :-)"
+"slnečnom svetle. Pozrieť dialóg v JOSM nastaveniach a 'Map Settings"
+"(nastavenia mapy' (divné, ale pravdivé :-)"
 
 #. Plugin Create_grid_of_ways
@@ -21423,6 +21663,5 @@
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
-msgstr ""
-"Vytvorenie a správa adresných bodov a budov vrámci  Českej Republiky."
+msgstr "Vytvorenie a správa adresných bodov a budov vrámci  Českej Republiky."
 
 #. Plugin dataimport
@@ -21455,21 +21694,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 "Sťahuje GPS body z Globalsat DG100 datalogger-a  priamo do JOSM."
 
 #. Plugin graphview
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:28
 msgid "Visualizes routing information as a routing graph."
 msgstr "Vizualizuje \"routing information\" ako routovací graf."
 
 #. Plugin grid
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:30
 msgid "Provide a background layer that displays a map grid"
 msgstr "Určiť vrstvu pozadia pre zobrazenie mapovej súradnicovej siete"
 
 #. 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 "
@@ -21482,10 +21720,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:34
 msgid "Helps vectorizing WMS images."
 msgstr "Pomoc pri vektorizácii WMS obrázkov."
 
 #. 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."
@@ -21495,5 +21733,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 "
@@ -21506,15 +21744,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 "Pridanie zákazu zabočenia vľavo pre sadu zo 4 alebo 5 ciest"
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:42
 msgid "Simply convert an area to a multipolygon."
 msgstr "Jednoduché prevedenie oblasti na multipolygón."
 
 #. Plugin multipoly
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:44
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -21525,5 +21763,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 "
@@ -21536,15 +21774,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:48
 msgid "Displays an OpenLayers background image"
 msgstr "Zobrazenie OpenLayers obrázok pozadia"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:50
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importuje vydania z OpenStreetBugs"
 
 #. 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"
@@ -21554,5 +21792,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."
@@ -21561,5 +21799,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 "
@@ -21570,5 +21808,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 "
@@ -21579,10 +21817,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Ohromný JGoodies Plastic Look and Feel."
 
 #. 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."
@@ -21590,15 +21828,16 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "Let other applications send commands to JOSM."
 msgstr "Necháva ostatné aplikácie poslať príkaz do JOSMu."
 
 #. 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 "
@@ -21609,10 +21848,17 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:71
 msgid "Provides routing capabilities."
 msgstr "Určuje trasové schopnosti"
 
+#. 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 "
@@ -21623,15 +21869,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:77
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Povoľuje pridávanie značiek/bodov na aktuálnu gps pozíciu."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:79
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Určuje dialóg pre editáciu značiek v tabuľkovej mriežke."
 
 #. 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 "
@@ -21644,10 +21890,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:83
 msgid "Make terraced houses out of single blocks."
 msgstr "Vytvára radové domy mimo jednotlivých blokov."
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:85
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21656,5 +21902,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) "
@@ -21665,5 +21911,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:89
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21672,10 +21918,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 "
@@ -21687,5 +21933,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 "
@@ -21695,5 +21941,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:97
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21704,5 +21950,5 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:99
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
@@ -21710,10 +21956,10 @@
 
 #. Plugin wayselector
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:101
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Vyberte poradie nerozvetvených spojených ciest"
 
 #. 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 "
@@ -21724,5 +21970,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:105
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22614,10 +22860,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 "kruhový objazd (roundabout)"
@@ -22754,8 +23000,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"/>
@@ -22965,5 +23211,5 @@
 #. color motorroad
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -22973,5 +23219,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -22990,5 +23236,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -22998,5 +23244,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -23015,5 +23261,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -23023,5 +23269,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -23040,5 +23286,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -23048,5 +23294,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -23061,5 +23307,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -23077,8 +23323,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 "obytná (osídlená)"
@@ -23093,5 +23339,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -23100,5 +23346,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--public_transport tags -->
 #. <rule>
@@ -23108,10 +23354,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 "obslužná (service)"
@@ -23126,5 +23372,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -23133,5 +23379,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -23141,10 +23387,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 "konštrukcia"
@@ -23811,6 +24057,5 @@
 #: build/trans_presets.java:777
 msgid "Bus Trap"
-msgstr ""
-"Bus trap (rohož cez cestu zabraňujúca vjazdu vozidiel okrem autobusov)"
+msgstr "Bus trap (rohož cez cestu zabraňujúca vjazdu vozidiel okrem autobusov)"
 
 #. item "Barriers/Bus Trap"
@@ -23983,6 +24228,5 @@
 #: build/trans_presets.java:928
 msgid "Sally Port"
-msgstr ""
-"Sally port (vstupný portál do pevnosti s vonkajšou a vnútornou bránou)"
+msgstr "Sally port (vstupný portál do pevnosti s vonkajšou a vnútornou bránou)"
 
 #. item "Barriers/Sally Port"
@@ -24159,9 +24403,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 "močiar (marsh)"
@@ -24491,5 +24735,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -24499,5 +24743,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -24507,5 +24751,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -24515,5 +24759,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -24523,5 +24767,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -24531,5 +24775,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -24539,5 +24783,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -24548,5 +24792,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -24554,9 +24798,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 "koľajnica (rail)"
@@ -25967,5 +26211,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -25975,5 +26219,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -25983,5 +26227,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -25991,5 +26235,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -26353,7 +26597,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--sport tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -26363,5 +26607,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -26371,5 +26615,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -26379,5 +26623,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -26387,5 +26631,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -26395,5 +26639,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -26403,5 +26647,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -26411,5 +26655,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -26419,5 +26663,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -26427,5 +26671,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -26435,5 +26679,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -26443,5 +26687,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -26451,5 +26695,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -26459,5 +26703,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -26467,5 +26711,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -26475,5 +26719,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -26483,5 +26727,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -26491,5 +26735,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -26499,5 +26743,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -26507,5 +26751,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -26515,5 +26759,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -26523,5 +26767,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -26531,5 +26775,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -26539,5 +26783,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -26547,5 +26791,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -26555,5 +26799,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -26563,5 +26807,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -26571,5 +26815,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -26579,5 +26823,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -26587,5 +26831,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -26595,5 +26839,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -26603,5 +26847,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -26611,5 +26855,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -26619,5 +26863,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -26627,5 +26871,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -26635,5 +26879,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -26643,5 +26887,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -26651,5 +26895,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -26659,5 +26903,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -26667,5 +26911,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -26675,5 +26919,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -26683,5 +26927,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -26691,5 +26935,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -26699,5 +26943,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -26707,5 +26951,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -26715,5 +26959,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -26723,33 +26967,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"
@@ -28431,7 +28675,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--landuse tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -28441,5 +28685,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -28449,5 +28693,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -28457,5 +28701,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -28465,5 +28709,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -28473,5 +28717,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -28481,5 +28725,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -28489,5 +28733,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -28497,12 +28741,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 "zelená"
@@ -29919,5 +30163,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -29933,5 +30177,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -29941,18 +30185,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 -->
@@ -29961,7 +30222,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- cycleway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -29971,5 +30232,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -29979,5 +30240,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -29987,5 +30248,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -29995,12 +30256,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 "bicykel"
@@ -30027,5 +30289,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -30041,5 +30303,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -30049,5 +30311,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -30056,13 +30318,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"/>
@@ -30073,11 +30343,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 "pešia (foot)"
@@ -30096,8 +30367,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 "metro (subway)"
@@ -30209,9 +30480,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
@@ -30219,5 +30490,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,
@@ -30227,8 +30498,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
@@ -30242,5 +30513,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#. 
+#.
 #: build/trans_style.java:72
 msgid "standard"
@@ -30248,5 +30519,5 @@
 
 #. mappaint style named "standard"
-#. 
+#.
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -30295,6 +30566,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>
@@ -30374,5 +30645,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -30382,16 +30653,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 "zastaralý"
@@ -30402,5 +30673,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -30409,5 +30680,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -30416,5 +30687,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -30430,5 +30701,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -30442,5 +30713,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -30449,5 +30720,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -30456,5 +30727,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -30463,5 +30734,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -30470,5 +30741,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -30477,5 +30748,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -30484,5 +30755,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxweight"/>
@@ -30491,5 +30762,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxheight"/>
@@ -30498,5 +30769,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -30505,5 +30776,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxlength"/>
@@ -30512,5 +30783,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -30519,5 +30790,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="minspeed"/>
@@ -30526,5 +30797,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxstay"/>
@@ -30533,5 +30804,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="toll"/>
@@ -30540,5 +30811,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="barrier"/>
@@ -30715,7 +30986,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- highway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -30729,5 +31000,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -30737,7 +31008,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- tracktype tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -30747,5 +31018,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -30755,5 +31026,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -30763,5 +31034,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -30771,10 +31042,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 "cesta (highway_track)"
@@ -30785,5 +31056,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -30792,5 +31063,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -30800,5 +31071,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -30807,5 +31078,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -30814,5 +31085,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -30821,5 +31092,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -30828,5 +31099,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -30835,5 +31106,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -30842,5 +31113,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -30849,5 +31120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -30856,5 +31127,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -30863,8 +31134,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 "služby"
@@ -30875,8 +31146,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 "brod"
@@ -30887,5 +31158,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -30894,8 +31165,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 "turningcircle (zaokrúhlený koniec cesty pre ľahšie otáčanie sa aut)"
@@ -30906,9 +31177,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 "miesto pohotovostnej prvej pomoci"
@@ -30919,9 +31190,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 "riečny breh"
@@ -30932,8 +31203,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 "potok"
@@ -30944,8 +31215,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 "dok (nakladacia rampa)"
@@ -30956,5 +31227,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -30963,5 +31234,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -30970,5 +31241,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -30978,5 +31249,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -30985,5 +31256,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -30992,5 +31263,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -30999,5 +31270,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -31007,5 +31278,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -31016,5 +31287,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -31024,7 +31295,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--man_made tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -31034,5 +31305,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -31042,5 +31313,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -31050,5 +31321,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -31059,5 +31330,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -31066,5 +31337,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -31074,5 +31345,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -31082,5 +31353,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -31090,5 +31361,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -31098,5 +31369,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -31106,5 +31377,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -31114,5 +31385,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -31122,5 +31393,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -31130,5 +31401,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -31138,18 +31409,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 "človekom vytvorené (manmade)"
@@ -31159,9 +31430,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 ""
@@ -31172,7 +31443,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- railway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -31182,5 +31453,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -31189,5 +31460,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -31197,5 +31468,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -31204,5 +31475,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -31212,5 +31483,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -31220,10 +31491,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 "železničná výhybka"
@@ -31234,5 +31505,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -31243,13 +31514,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 "iná koľaj"
 
 #. color otherrail
-#: build/trans_style.java:1192
+#: build/trans_style.java:1217
 msgid "railover"
 msgstr "nadchod nad železnicou"
@@ -31260,5 +31531,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -31268,5 +31539,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -31279,5 +31550,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -31285,7 +31556,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 "historická železnica(turistická)"
@@ -31296,5 +31567,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -31303,5 +31574,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -31310,5 +31581,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -31317,7 +31588,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aeroway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -31328,9 +31599,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 "letecké cesty"
@@ -31341,8 +31612,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 "terminál"
@@ -31353,5 +31624,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -31361,8 +31632,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 "zjazdovka_čierna"
@@ -31373,8 +31644,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 "zjazdovka_ľahká"
@@ -31385,5 +31656,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -31392,5 +31663,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -31399,7 +31670,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aerialway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -31409,5 +31680,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -31417,5 +31688,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -31425,5 +31696,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -31433,5 +31704,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -31441,10 +31712,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 "Visuté cesty/Lanovky"
@@ -31455,11 +31726,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 "mierna zjazdovka (piste_easy)"
@@ -31470,9 +31741,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 "stredne ťažká zjazdovka (piste_intermediate)"
@@ -31483,9 +31754,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 "zjazdovka pre pokročilých (piste_advanced)"
@@ -31496,9 +31767,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 "zjazdovka pre expertov (piste_expert)"
@@ -31509,9 +31780,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 "zjazdovka pre freeride (piste_freeride)"
@@ -31522,9 +31793,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 "zjazdovka pre začiatočníkov (piste_novice)"
@@ -31535,7 +31806,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--power tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -31545,5 +31816,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -31552,5 +31823,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -31560,5 +31831,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -31568,5 +31839,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -31576,5 +31847,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -31584,5 +31855,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -31592,5 +31863,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -31600,5 +31871,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -31608,5 +31879,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -31616,5 +31887,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -31624,5 +31895,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -31632,5 +31903,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -31640,15 +31911,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 "energia (power)"
@@ -31658,9 +31929,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 "hrádza (pier)"
@@ -31671,8 +31942,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 "potrubie (pipeline)"
@@ -31682,7 +31953,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--leisure tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -31692,5 +31963,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -31700,5 +31971,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -31708,5 +31979,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -31716,5 +31987,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -31724,5 +31995,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -31732,5 +32003,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -31740,5 +32011,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -31748,5 +32019,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -31756,5 +32027,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -31764,5 +32035,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -31772,5 +32043,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -31780,5 +32051,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -31788,5 +32059,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -31796,5 +32067,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -31804,5 +32075,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -31812,17 +32083,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 "oddych (leisure)"
@@ -31832,9 +32103,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 "prístav (marina)"
@@ -31844,7 +32115,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--amenity tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -31854,5 +32125,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -31862,5 +32133,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -31870,5 +32141,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -31878,5 +32149,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -31886,5 +32157,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -31894,5 +32165,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -31902,5 +32173,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -31910,5 +32181,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -31918,5 +32189,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -31926,14 +32197,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 "zaujímavosti (amenity)"
@@ -31943,5 +32214,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -31951,5 +32222,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -31959,5 +32230,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -31967,5 +32238,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -31975,5 +32246,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -31983,5 +32254,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -31991,5 +32262,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -31999,5 +32270,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -32007,5 +32278,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -32015,5 +32286,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -32023,5 +32294,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -32031,14 +32302,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 "verejná_doprava"
@@ -32048,5 +32319,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -32055,5 +32326,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -32063,5 +32334,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -32070,5 +32341,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -32078,5 +32349,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -32086,5 +32357,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -32094,5 +32365,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -32101,5 +32372,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -32109,5 +32380,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -32117,5 +32388,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -32125,5 +32396,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -32133,5 +32404,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -32140,5 +32411,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -32147,5 +32418,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -32154,5 +32425,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -32161,5 +32432,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -32168,5 +32439,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -32175,5 +32446,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -32182,5 +32453,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -32189,5 +32460,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -32196,5 +32467,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -32203,5 +32474,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -32210,5 +32481,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -32217,5 +32488,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -32224,5 +32495,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -32232,5 +32503,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -32240,5 +32511,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -32248,5 +32519,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -32256,5 +32527,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -32264,5 +32535,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -32272,5 +32543,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -32280,5 +32551,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -32288,5 +32559,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -32296,5 +32567,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -32305,5 +32576,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -32313,5 +32584,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -32321,5 +32592,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -32329,5 +32600,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -32337,5 +32608,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -32345,5 +32616,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -32353,5 +32624,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -32361,5 +32632,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -32369,5 +32640,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -32377,5 +32648,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -32385,5 +32656,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -32393,5 +32664,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -32401,5 +32672,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -32409,5 +32680,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -32417,5 +32688,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -32425,5 +32696,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"/>
@@ -32433,5 +32712,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -32441,5 +32720,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -32449,5 +32728,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -32457,5 +32736,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -32464,27 +32743,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 "svetelné zariadenie"
@@ -32494,5 +32774,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -32502,5 +32782,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -32510,12 +32790,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 "osvetlená_voda (light_water)"
@@ -32525,5 +32805,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -32533,5 +32813,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -32541,5 +32821,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -32549,5 +32829,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -32557,5 +32837,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -32565,5 +32845,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -32573,11 +32853,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 "zdravie"
@@ -32587,7 +32867,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--shop tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -32597,5 +32877,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -32605,5 +32885,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -32613,5 +32893,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -32621,5 +32901,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -32629,5 +32909,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -32637,5 +32917,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -32645,5 +32925,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -32653,5 +32933,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -32661,5 +32941,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -32669,5 +32949,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -32677,5 +32957,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -32685,5 +32965,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -32693,5 +32973,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -32701,5 +32981,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -32709,5 +32989,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -32717,5 +32997,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -32725,5 +33005,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -32733,5 +33013,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -32741,5 +33021,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -32749,5 +33029,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -32757,5 +33037,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -32765,5 +33045,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -32773,5 +33053,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -32781,5 +33061,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -32789,5 +33069,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -32797,5 +33077,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -32805,5 +33085,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -32813,5 +33093,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -32821,5 +33101,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -32829,5 +33109,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -32837,5 +33117,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -32845,5 +33125,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -32853,5 +33133,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -32861,5 +33141,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -32869,5 +33149,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -32877,5 +33157,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -32885,5 +33165,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -32893,5 +33173,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -32901,5 +33181,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -32909,5 +33189,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -32917,5 +33197,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -32925,31 +33205,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 "obchod"
@@ -32959,7 +33239,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--tourism tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -32969,5 +33249,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -32977,5 +33257,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -32985,5 +33265,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -32993,5 +33273,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -33001,5 +33281,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -33009,5 +33289,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -33017,12 +33297,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 "hotel"
@@ -33032,5 +33312,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -33040,5 +33320,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -33048,5 +33328,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -33056,5 +33336,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -33064,5 +33344,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -33072,5 +33352,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -33081,5 +33361,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -33089,5 +33369,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- information tags -->
 #. <rule>
@@ -33097,5 +33377,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -33105,5 +33385,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -33112,5 +33392,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -33119,13 +33399,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 "cestovanie"
@@ -33135,7 +33415,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--historic tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -33145,5 +33425,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -33153,5 +33433,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -33161,5 +33441,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -33169,5 +33449,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -33177,5 +33457,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -33185,5 +33465,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -33193,5 +33473,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -33201,5 +33481,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -33209,13 +33489,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 "historické"
@@ -33225,8 +33505,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 "lom"
@@ -33237,8 +33517,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 "skládka odpadov (landfill)"
@@ -33249,5 +33529,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -33257,8 +33537,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 "(basin) kotvisko pre lode s udržiavanou výškou hladiny vody"
@@ -33269,8 +33549,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 "farmy"
@@ -33281,6 +33561,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
-#. 
+#.
+#.
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -33290,8 +33570,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 "maloobchody"
@@ -33302,8 +33582,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 "závody"
@@ -33314,8 +33594,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 "brownfield (opustený priemyselný objekt)"
@@ -33326,8 +33606,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 "greenfield (oblasť používaná pre poľnohospodárstvo)"
@@ -33338,8 +33618,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 "železničný pozemok"
@@ -33350,5 +33630,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -33358,7 +33638,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--military tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -33368,5 +33648,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -33376,5 +33656,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -33384,5 +33664,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -33392,11 +33672,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 "armáda"
@@ -33407,8 +33687,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 "cintorín (cemetery)"
@@ -33418,8 +33698,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 "vrchol (peak)"
@@ -33430,9 +33710,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 "ľadovec (glacier)"
@@ -33442,9 +33722,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 "sopka"
@@ -33454,5 +33734,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -33463,5 +33743,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -33471,5 +33751,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -33479,5 +33759,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -33487,5 +33767,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -33495,12 +33775,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 "prírodné (natural)"
@@ -33510,9 +33790,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 "oblasť pokrytá krovím"
@@ -33522,9 +33802,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 "vresovisko"
@@ -33534,9 +33814,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 "zalesnená oblasť (woodarea)"
@@ -33546,9 +33826,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 "blato (mud)"
@@ -33558,9 +33838,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 "pláž (beach)"
@@ -33571,5 +33851,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?
@@ -33595,5 +33875,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -33604,11 +33884,11 @@
 #. </rule>
 #. -->
-#. 
+#.
 #. <!--name tags -->
-#. 
+#.
 #. <!--preferences tags -->
-#. 
+#.
 #. <!--place tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -33618,5 +33898,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -33626,5 +33906,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -33634,5 +33914,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -33642,5 +33922,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -33650,5 +33930,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -33658,5 +33938,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -33666,5 +33946,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -33674,5 +33954,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -33682,5 +33962,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -33690,5 +33970,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -33698,5 +33978,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -33706,15 +33986,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 "miesto"
@@ -33724,9 +34004,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 ""
@@ -33817,5 +34097,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#. 
+#.
 #. Data type can be:
 #. node        - a node point
@@ -33823,28 +34103,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
@@ -33959,5 +34239,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#. 
+#.
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -33970,5 +34250,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>
@@ -33993,6 +34273,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#. 
-#. 
+#.
+#.
 #. only for Germany
 #: build/trans_wms.java:17
@@ -34001,6 +34281,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#. 
-#. 
+#.
+#.
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -34015,6 +34295,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
@@ -34028,6 +34308,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
@@ -34047,6 +34327,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#. 
-#. 
+#.
+#.
 #. only for Japan
 #: build/trans_wms.java:39
@@ -34070,6 +34350,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
@@ -34082,4 +34362,13 @@
 msgstr "Sicily - Italy"
 
+#~ 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 ""
+#~ "Cieľový objekt s id {0} a verziou {1} je viditeľný aj keď zdrojový objekt "
+#~ "s nižšou verziou {2} nie je viditeľný. Nemôžem sa zaoberať s touto "
+#~ "nezrovnalosťou. Ponechávam cieľový objekt. "
+
 #~ msgid "Move"
 #~ msgstr "Presunúť"
@@ -34121,5 +34410,4 @@
 #~ msgstr "Neboli importované žiadne dáta."
 
-#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Chyba pri načítaní stránky {0}"
@@ -34131,5 +34419,4 @@
 #~ msgstr "Prenos pre chybu ukončený (budem čakať 5 sekúnd):"
 
-#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Plugin nenájdený: {0}."
@@ -34151,6 +34438,6 @@
 
 #~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before reporting "
-#~ "a bug."
+#~ "Try updating to the newest version of JOSM and all plugins before "
+#~ "reporting a bug."
 #~ msgstr ""
 #~ "Skúste aktualizovať na najnovšiu verziu tohoto doplnku (pluginu) pred "
@@ -34163,5 +34450,4 @@
 #~ msgstr "Nájdený element <nd> mimo cesty."
 
-#, java-format
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr "Vynecháva sa cesta pretože obsahuje body ktoré neexistujú: {0}\n"
@@ -34171,6 +34457,6 @@
 #~ "some time."
 #~ msgstr ""
-#~ "Server vrátil vnútornú chybu. Skúste to za chvíľu znovu alebo skúste zmenšiť "
-#~ "oblasť."
+#~ "Server vrátil vnútornú chybu. Skúste to za chvíľu znovu alebo skúste "
+#~ "zmenšiť oblasť."
 
 #~ msgid "<nd> has zero ref"
@@ -34196,9 +34482,7 @@
 #~ "Môžete použiť koliesko myši alebo Ctrl+Šípky pre zväčšenie, alebo  posun"
 
-#, java-format
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "Použiť prednastavenie \"{0}\" zo skupiny \"{1}\""
 
-#, java-format
 #~ msgid "Use preset ''{0}''"
 #~ msgstr "Použiť prednastavenie \"{0}\""
@@ -34226,11 +34510,10 @@
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version selected "
-#~ "in the history list."
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
 #~ msgstr ""
 #~ "Vrátiť stav všetkých vybratých objektov na verziu vybratú zo zoznamu "
 #~ "histórie."
 
-#, java-format
 #~ msgid "Layers: {0}"
 #~ msgstr "Vrstvy: {0}"
@@ -34240,6 +34523,6 @@
 
 #~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this as "
-#~ "a bug."
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
 #~ msgstr ""
 #~ "Interná chyba: nemôžem overiť podmienky pre žiadne vrstvy. Hlásim chybu."
@@ -34251,5 +34534,4 @@
 #~ msgstr "Nahrať výber"
 
-#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "Kontakt {0}..."
@@ -34258,9 +34540,7 @@
 #~ msgstr "Očakávam uzatváraciu zátvorku."
 
-#, java-format
 #~ msgid "Parsing error in URL: \"{0}\""
 #~ msgstr "Chyba parsovania v URL:\"{0}\""
 
-#, java-format
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "Nemôžem čítať z URL:\"{0}\""
@@ -34270,5 +34550,6 @@
 
 #~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr "Prosím vyberte jednu alebo viac uzavretých ciest s najmenej 4 bodmi."
+#~ msgstr ""
+#~ "Prosím vyberte jednu alebo viac uzavretých ciest s najmenej 4 bodmi."
 
 #~ msgid "Only one node selected"
@@ -34293,5 +34574,4 @@
 #~ msgstr "Otvoriť súbor (as raw gps, if .gpx)"
 
-#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Nemôžem otvoríť adresár s nastavením: {0}"
@@ -34301,6 +34581,6 @@
 
 #~ 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 ""
 #~ "Aktivácia aktualizovaných pluginov zlyhala. Zkontrolujte, či máte práva k "
@@ -34310,17 +34590,13 @@
 #~ msgstr "meno"
 
-#, java-format
 #~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
 #~ msgstr "Nedá sa prečítať čas \"{0}\" z bodu {1} x {2}"
 
-#, java-format
 #~ msgid "GPS start: {0}"
 #~ msgstr "Štart GPS: {0}"
 
-#, java-format
 #~ msgid "No time for point {0} x {1}"
 #~ msgstr "Žiadny čas pre bod {0} x {1}"
 
-#, java-format
 #~ msgid "Images for {0}"
 #~ msgstr "Obrázky pre {0}"
@@ -34329,5 +34605,4 @@
 #~ msgstr "Čítať GPX..."
 
-#, java-format
 #~ msgid "current delta: {0}s"
 #~ msgstr "súčastná odchylka: {0}s"
@@ -34342,5 +34617,4 @@
 #~ msgstr "Zadajte dátum v tvare (mm/dd/rrrr HH:MM:SS)"
 
-#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} vo vnútry stopy (track)."
@@ -34349,9 +34623,7 @@
 #~ msgstr "Synchronizovať hodiny"
 
-#, java-format
 #~ msgid "The date in file \"{0}\" could not be parsed."
 #~ msgstr "Dáta v súbore \"{0}\" nemohli byť parsované."
 
-#, java-format
 #~ msgid "GPS end: {0}"
 #~ msgstr "Koniec GPS: {0}"
@@ -34366,5 +34638,6 @@
 #~ "Login password to the OSM account. Leave blank to not store any password."
 #~ msgstr ""
-#~ "Prihlasovacie heslo k OSM účtu. Nechajte prázdne, keď nechcete heslo ukladať."
+#~ "Prihlasovacie heslo k OSM účtu. Nechajte prázdne, keď nechcete heslo "
+#~ "ukladať."
 
 #~ msgid "Plugin already exists"
@@ -34392,5 +34665,4 @@
 #~ msgstr "Heslo pre proxy"
 
-#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -34402,5 +34674,4 @@
 #~ "{0}"
 
-#, java-format
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Nemôžem stiahnuť plugin: {0} z {1}"
@@ -34412,5 +34683,4 @@
 #~ msgstr "Značky (prázdne hodnoty zmazaných značiek)"
 
-#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Príkazový Stĺpik: {0}"
@@ -34419,5 +34689,4 @@
 #~ msgstr "Obnoviť obsah výberu."
 
-#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -34471,11 +34740,9 @@
 #~ msgstr "Upraviť pozíciu WMS vrstvy"
 
-#~ msgid "Are you sure?"
-#~ msgstr "Ste si istý?"
-
-#, java-format
-#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
+#~ msgid ""
+#~ "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them all?"
+#~ "The selection contains {0} ways. Are you sure you want to simplify them "
+#~ "all?"
 #~ msgstr[0] "Výber obsahuje {0} cestu. Naozaj ju chcete zjednodušiť?"
 #~ msgstr[1] "Výber obsahuje {0} cesty. Naozaj ich chcete zjednodušiť?"
@@ -34491,5 +34758,6 @@
 #~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
 #~ msgstr ""
-#~ "<html>Môžem použiť obrázok z môjho GPS prímača.<br>Môže toto pomôcť?</html>"
+#~ "<html>Môžem použiť obrázok z môjho GPS prímača.<br>Môže toto pomôcť?</"
+#~ "html>"
 
 #~ msgid "Images with no exif position"
@@ -34517,5 +34785,4 @@
 #~ msgstr "Problém s vykresľováním"
 
-#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Prosíme napíšte chybovú správu v {0}"
@@ -34617,5 +34884,4 @@
 #~ msgstr "Najdená viac než jedna \"from\" cesta."
 
-#, java-format
 #~ msgid "Way ''{0}'' with less than two points."
 #~ msgstr "Cesta ''{0}'' s menej, než dvoma bodmi."
@@ -34624,17 +34890,13 @@
 #~ msgstr "Nenajdená cesta \"from\"."
 
-#, java-format
 #~ msgid "Unknown member type for ''{0}''."
 #~ msgstr "Neznámy typ člena pre ''{0}''."
 
-#, java-format
 #~ msgid "Unknown role ''{0}''."
 #~ msgstr "Neznáma funkcia ''{0}''."
 
-#, java-format
 #~ msgid "Error: {0}"
 #~ msgstr "Chyba: {0}"
 
-#, java-format
 #~ msgid "Warning: {0}"
 #~ msgstr "Varovanie: {0}"
@@ -34644,13 +34906,12 @@
 
 #~ msgid ""
-#~ "You are about to delete nodes outside of the area you have "
-#~ "downloaded.<br>This can cause problems because other objects (that you don't "
-#~ "see) might use them.<br>Do you really want to delete?"
+#~ "You are about to delete nodes outside of the area you have downloaded."
+#~ "<br>This can cause problems because other objects (that you don't see) "
+#~ "might use them.<br>Do you really want to delete?"
 #~ msgstr ""
 #~ "Chystáte sa zmazať body mimo Vami stiahnutú oblasť.<br>Toto môže spôsobiť "
-#~ "problém iným objektom (nevidíte ich), ktoré môžu používať tieto "
-#~ "body.<br>Naozaj ich chcete zmazať?"
-
-#, java-format
+#~ "problém iným objektom (nevidíte ich), ktoré môžu používať tieto body."
+#~ "<br>Naozaj ich chcete zmazať?"
+
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Vyriešiť {0} konfliktov v {1} objektoch."
@@ -34677,29 +34938,22 @@
 #~ msgstr "Nenajdená cesta \"to\"."
 
-#, java-format
 #~ msgid "No useful role ''{0}'' for Way ''{1}''."
 #~ msgstr "Neplatná funkcia ''{0}'' pre Cestu ''{1}''."
 
-#, java-format
 #~ msgid "Style for outer way ''{0}'' mismatches."
 #~ msgstr "Označenie pre vonkajšiu(obvodovú) cestu ''{0}'' je zamenené."
 
-#, java-format
 #~ msgid "Non-Way ''{0}'' in multipolygon."
 #~ msgstr "Cesta v opačnom smere(Non-Way) ''{0}'' v multipolygóne."
 
-#, java-format
 #~ msgid "No outer way for multipolygon ''{0}''."
 #~ msgstr "Multipolygón ''{0}'' nemá žiadnu vonkajšiu(obvodovú) cestu."
 
-#, java-format
 #~ msgid "Intersection between ways ''{0}'' and ''{1}''."
 #~ msgstr "Cesty ''{0}'' a ''{1}'' se pretínajú."
 
-#, java-format
 #~ msgid "Inner way ''{0}'' is outside."
 #~ msgstr "Vnútorná(inner) cesta ''{0}'' je vonku."
 
-#, java-format
 #~ msgid "Style for restriction {0} not found."
 #~ msgstr "Štýl pre obmedzenie {0} nenajdený."
@@ -34711,5 +34965,4 @@
 #~ msgstr "áno (pravda)"
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -34751,5 +35004,6 @@
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you load\n"
+#~ "Parameters are read in the order they are specified, so make sure you "
+#~ "load\n"
 #~ "some data before --selection"
 #~ msgstr ""
@@ -34822,11 +35076,10 @@
 #~ msgstr "Metacarta Map Rectifier(prekresľovač) obrázka id"
 
-#, java-format
 #~ msgid "rectifier id={0}"
 #~ msgstr "prekresľovač id={0}"
 
 #~ msgid ""
-#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
-#~ "these will then show up in the WMS menu.\n"
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
 #~ "\n"
 #~ "You can also do this manually in the Advanced Preferences, using the "
@@ -34843,6 +35096,6 @@
 #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
 #~ "only need to input the relevant 'id'.\n"
-#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in "
-#~ "this example,replacing 73 with your image id: \n"
+#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
+#~ "in this example,replacing 73 with your image id: \n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -34851,6 +35104,6 @@
 #~ "use."
 #~ msgstr ""
-#~ "Môžete pridať, upravovať a zmazať WMS položky v nastaveniach pre WMS plugin -"
-#~ " zmeny sa prejavia aj vo WMS menu.\n"
+#~ "Môžete pridať, upravovať a zmazať WMS položky v nastaveniach pre WMS "
+#~ "plugin - zmeny sa prejavia aj vo WMS menu.\n"
 #~ "\n"
 #~ "Môžete zmeny urobiť aj ručne v hlavnom nastavení, použite nasledujúci "
@@ -34864,6 +35117,6 @@
 #~ "format=image/jpeg\n"
 #~ "\n"
-#~ "Pre Metacarta's Map Rectifier(prekresľovač "
-#~ "http://labs.metacarta.com/rectifier/ , potrebujete iba príslušný 'id'.\n"
+#~ "Pre Metacarta's Map Rectifier(prekresľovač http://labs.metacarta.com/"
+#~ "rectifier/ , potrebujete iba príslušný 'id'.\n"
 #~ "Pridať  Metacarta Map Rectifier položku v menu, ručne vytvoriť  URL ako v "
 #~ "tomto príklade,nahradiť 73 s vašim id obrázka:\n"
@@ -34871,17 +35124,17 @@
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
 #~ "\n"
-#~ "Poznánka: Uistite sa či je možné obrázok použiť, pre autorské práva, ak máte "
-#~ "pochybnosť, nepoužite ho."
+#~ "Poznánka: Uistite sa či je možné obrázok použiť, pre autorské práva, ak "
+#~ "máte pochybnosť, nepoužite ho."
 
 #~ msgid "aqueduct"
 #~ msgstr "akvadukt"
 
-#, java-format
 #~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded automatically."
+#~ "The plugin {0} seems to be broken or could not be downloaded "
+#~ "automatically."
 #~ msgstr ""
-#~ "Plugin {0} sa zdá byť poškodený, alebo ho nie je možné automaticky stiahnuť."
-
-#, java-format
+#~ "Plugin {0} sa zdá byť poškodený, alebo ho nie je možné automaticky "
+#~ "stiahnuť."
+
 #~ msgid "multipolygon way ''{0}'' is not closed."
 #~ msgstr "Cesta v multipolygóne ''{0}'' nie je uzatvorená."
@@ -34890,5 +35143,4 @@
 #~ msgstr "Cesta označená ako plocha nie je uzavretá."
 
-#, java-format
 #~ msgid "There is no EXIF time within the file \"{0}\"."
 #~ msgstr "V súbore \"{0}\" nie je časová značka EXIF"
@@ -34909,5 +35161,4 @@
 #~ msgstr "Zobraziť panel autorov(spracovateľov)"
 
-#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "Autori(spracovatelia): {0}"
@@ -34933,5 +35184,4 @@
 #~ "the config option 'pluginmanager.warntime'.)"
 
-#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -34957,6 +35207,6 @@
 #~ msgstr "Dodatočný zdroj automatických-značiek:"
 
-#, java-format
-#~ msgid "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
+#~ msgid ""
+#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
 #~ msgstr ""
 #~ "Lambert zóna {0} v cache je nekompatibilná s aktuálnou Lambert zónou {1}"
@@ -34965,5 +35215,4 @@
 #~ msgstr "Odstrániť označené"
 
-#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "Uvedený plugin požaduje aktualizovať JOSM: {0}."
@@ -34972,5 +35221,4 @@
 #~ msgstr "Zle formulované id bodu"
 
-#, java-format
 #~ msgid "Style for inner way ''{0}'' equals multipolygon."
 #~ msgstr "Štýl pre vnútornú cestu ''{0}'' je ekvivalentný polygónu."
@@ -35000,5 +35248,4 @@
 #~ msgstr "Posunúť dole"
 
-#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Editor relácie: {0}"
@@ -35020,13 +35267,11 @@
 #~ "nahraté elementy majú zaznamenaný priebeh(history)."
 
-#, java-format
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
 #~ "continue?"
 #~ msgstr ""
-#~ "Táto činnosť vyžaduje {0} individuálne požiadavky na stiahnutie. Prajete si "
-#~ "pokračovať?"
-
-#, java-format
+#~ "Táto činnosť vyžaduje {0} individuálne požiadavky na stiahnutie. Prajete "
+#~ "si pokračovať?"
+
 #~ msgid "Change the projection to {0} first."
 #~ msgstr "Najskôr zmente projekciu na {0}."
@@ -35035,9 +35280,7 @@
 #~ msgstr "Chybná projekcia"
 
-#, java-format
 #~ msgid "Found {0} matches of {1} in GPX track {2}"
 #~ msgstr "Najdené {0} zhody z {1} v GPX stope {2}"
 
-#, java-format
 #~ msgid "Offset between track and photos: {0}m {1}s"
 #~ msgstr "Vyrovnanie rozdielu medzi stopou(track) a fotkami: {0}m {1}s"
@@ -35047,6 +35290,6 @@
 
 #~ msgid ""
-#~ "An error occured while trying to match the photos to the GPX track. You can "
-#~ "adjust the sliders to manually match the photos."
+#~ "An error occured while trying to match the photos to the GPX track. You "
+#~ "can adjust the sliders to manually match the photos."
 #~ msgstr ""
 #~ "Stala sa nejaká chyba, pri skúške či sa hodia fotky ku GPX stope. Môžete "
@@ -35105,14 +35348,14 @@
 #~ "import EXIF geotagged pictures."
 #~ msgstr ""
-#~ "Ďalší geotag(GPS poloha) plugin pre JOSM. Zľaďované obrázky s GPS stopami, "
-#~ "alebo import EXIF geotagged(GPS poloha) obrázkov."
+#~ "Ďalší geotag(GPS poloha) plugin pre JOSM. Zľaďované obrázky s GPS "
+#~ "stopami, alebo import EXIF geotagged(GPS poloha) obrázkov."
 
 #~ msgid ""
-#~ "Tools to work with authors/users. Selects map data that belongs to selected "
-#~ "user, opens browser showing selected author profile page."
+#~ "Tools to work with authors/users. Selects map data that belongs to "
+#~ "selected user, opens browser showing selected author profile page."
 #~ msgstr ""
-#~ "Nástroje na prácu s autormi/ používateľmi. Výber mapových dát, ktoré patria "
-#~ "vybratému používateľovi, otvoriť prehliadač so zobrazenou vybratou stránkou "
-#~ "profilu autora."
+#~ "Nástroje na prácu s autormi/ používateľmi. Výber mapových dát, ktoré "
+#~ "patria vybratému používateľovi, otvoriť prehliadač so zobrazenou vybratou "
+#~ "stránkou profilu autora."
 
 #~ msgid "Directly load TCX files from JOSM."
@@ -35121,10 +35364,10 @@
 #~ msgid ""
 #~ "The main feature of the plugin is the possibility to delete points of the "
-#~ "GPX track. This plugin can be used to prepare  tracks for uploading to OSM "
-#~ "eg. deleting uninteresting parts of track."
+#~ "GPX track. This plugin can be used to prepare  tracks for uploading to "
+#~ "OSM eg. deleting uninteresting parts of track."
 #~ msgstr ""
-#~ "Hlavná vlastnosť pluginu je možnosť vymazať body z GPx stopy (track). Tento "
-#~ "plugin môže byť použitý k príprave stôp (track) pre nahratie na OSM eg. "
-#~ "vymazaním nezaujímavých častí stopy (track)"
+#~ "Hlavná vlastnosť pluginu je možnosť vymazať body z GPx stopy (track). "
+#~ "Tento plugin môže byť použitý k príprave stôp (track) pre nahratie na OSM "
+#~ "eg. vymazaním nezaujímavých častí stopy (track)"
 
 #~ msgid "Remove route nodes"
@@ -35134,5 +35377,4 @@
 #~ msgstr "<mnohonásobný>"
 
-#, java-format
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
 #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
@@ -35154,6 +35396,6 @@
 
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want to "
-#~ "combine them?"
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
 #~ msgstr ""
 #~ "Zvolené cesty patria do iného vzťahu (relation). Naozaj ich chcete spojiť?"
@@ -35169,6 +35411,6 @@
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still want "
-#~ "to merge them?"
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
 #~ msgstr ""
 #~ "Zvolené body majú rozdielne vzťahové(relation) členy. Napriek tomu ich "
@@ -35182,5 +35424,6 @@
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data layer?"
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
 #~ msgstr ""
 #~ "Žiadne údaje pre uloženie sú nenájdené. Máte otvorenú, alebo načítanú "
@@ -35196,5 +35439,4 @@
 #~ msgstr "Chyby v priebehu sťahovania"
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -35234,15 +35476,13 @@
 #~ "about the problem."
 #~ msgstr ""
-#~ "Doplnok nie je možné odstrániť. Prosím informujte o tomto probléme vývojárov "
-#~ "JOSM."
+#~ "Doplnok nie je možné odstrániť. Prosím informujte o tomto probléme "
+#~ "vývojárov JOSM."
 
 #~ msgid "Open a layer first (GPX, OSM, cache)"
 #~ msgstr "Najprv vytvorte nejakú vrstvu (GPX, OSM, cache)"
 
-#, java-format
 #~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
 #~ msgstr "Neočakávaný \"type\" člena {0} relácie  {1} (hodnota {2})"
 
-#, java-format
 #~ msgid "Image with path {0} does not exist or is not readable."
 #~ msgstr "Obrázok na ceste {0} neexistuje alebo sa neda prečítať."
@@ -35254,5 +35494,4 @@
 #~ msgstr "% lon:"
 
-#, java-format
 #~ msgid "Resolve conflicts in member list of of relation {0}"
 #~ msgstr "Vyriešte rozpor v poradovom čísle relácie {0}"
@@ -35261,9 +35500,7 @@
 #~ msgstr "Zlé číslo parametrov pre operátor bodov."
 
-#, java-format
 #~ msgid "Incorrect value of id operator: {0}. Number is expected."
 #~ msgstr "Nesprávna hodnota pre id operátor: {0}.  Číslo je očakávané."
 
-#, java-format
 #~ msgid ""
 #~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
@@ -35282,5 +35519,4 @@
 #~ msgstr "POZOR: neočakávaná hodnota pre prednosť rozhodnutia konfliktu, got "
 
-#, java-format
 #~ msgid "Plugin {0} requires JOSM update to version {1}."
 #~ msgstr "Plugin {0} požaduje JOSM aktualizáciu na verziu {1}."
@@ -35298,5 +35534,4 @@
 #~ msgstr "Nahrávanie na OSM API neúspešné"
 
-#, java-format
 #~ msgid "Checking whether node {0} is gone ..."
 #~ msgstr "Kontrolujem či body {0} sú úplné(gone) ..."
@@ -35308,26 +35543,25 @@
 #~ msgstr "Obnovovanie cesty..."
 
-#, java-format
 #~ msgid "Checking whether primitive {0} is gone ..."
 #~ msgstr "Kontrolujem či sú závislosti {0} is gone ..."
 
-#, java-format
 #~ msgid ""
-#~ "<html>The OSM primitive with id <strong>{0}</strong> has been deleted<br>on "
-#~ "the server by another mapper.<br><br>Click <strong>{1}</strong> to keep your "
-#~ "primitive and ignore the deleted state.<br>Your primitive will be assigend a "
-#~ "new id.<br>Click <strong>{2}</strong> to accept the state on the server and "
-#~ "to delete your primitive.<br>Click <strong>{3}</strong> to cancel.<br>"
+#~ "<html>The OSM primitive with id <strong>{0}</strong> has been "
+#~ "deleted<br>on the server by another mapper.<br><br>Click <strong>{1}</"
+#~ "strong> to keep your primitive and ignore the deleted state.<br>Your "
+#~ "primitive will be assigend a new id.<br>Click <strong>{2}</strong> to "
+#~ "accept the state on the server and to delete your primitive.<br>Click "
+#~ "<strong>{3}</strong> to cancel.<br>"
 #~ msgstr ""
-#~ "<html>OSM pôvodné s id <strong>{0}</strong> bolo vymazané<br>na servery iným "
-#~ "mapérom.<br><br>Click <strong>{1}</strong> pomechať vaše pôvodné a ignorovať "
-#~ "vymazaný stav.<br>Vašemu pôvodnému bode priradené nové id.<br>Click "
-#~ "<strong>{2}</strong> prijať stav na servery a vymazať váš pôvodný "
-#~ "stav.<br>Click <strong>{3}</strong> zrušiť.<br>"
-
-#, java-format
+#~ "<html>OSM pôvodné s id <strong>{0}</strong> bolo vymazané<br>na servery "
+#~ "iným mapérom.<br><br>Click <strong>{1}</strong> pomechať vaše pôvodné a "
+#~ "ignorovať vymazaný stav.<br>Vašemu pôvodnému bode priradené nové id."
+#~ "<br>Click <strong>{2}</strong> prijať stav na servery a vymazať váš "
+#~ "pôvodný stav.<br>Click <strong>{3}</strong> zrušiť.<br>"
+
 #~ msgid ""
-#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for individual "
-#~ "update. Please reduce the selection<br>to max. {1} primitives.</html>"
+#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
+#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
+#~ "</html>"
 #~ msgstr ""
 #~ "<html>Sú tam <strong>{0}</strong> pôvodné <br>vybrané pre individuálnu "
@@ -35346,5 +35580,4 @@
 #~ msgstr "Aktualizácia pôvodných"
 
-#, java-format
 #~ msgid ""
 #~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
@@ -35353,6 +35586,6 @@
 #~ msgstr ""
 #~ "<html>Aktualizácia <strong>neúspešná</strong> pretože pôvodné sa "
-#~ "snaží<br>zmazať na servery už zmazané.<br><br>Chybová správa "
-#~ "je:<br>{0}</html>"
+#~ "snaží<br>zmazať na servery už zmazané.<br><br>Chybová správa je:<br>{0}</"
+#~ "html>"
 
 #~ msgid "Conflict detected"
@@ -35393,6 +35626,6 @@
 
 #~ msgid ""
-#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
-#~ "these will then show up in the WMS menu.\n"
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
 #~ "\n"
 #~ "You can also do this manually in the Advanced Preferences, using the "
@@ -35408,6 +35641,6 @@
 #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
 #~ "only need to input the relevant 'id'.\n"
-#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in "
-#~ "this example, replacing 73 with your image id:\n"
+#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
+#~ "in this example, replacing 73 with your image id:\n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -35419,6 +35652,6 @@
 #~ "toto sa potom zobrazí vo WMS menu.\n"
 #~ "\n"
-#~ "Môžete to tiež urobiť manuálne v Advanced Preferences, Použite nasledujúcu "
-#~ "schému:\n"
+#~ "Môžete to tiež urobiť manuálne v Advanced Preferences, Použite "
+#~ "nasledujúcu schému:\n"
 #~ "wmsplugin.url.1.name=Landsat\n"
 #~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
@@ -35429,8 +35662,8 @@
 #~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
 #~ "\n"
-#~ "Pre Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ "
-#~ ",potrebujete iba aktuálne vstupné 'id'.\n"
-#~ "Pre pridanie Metacarta Map Rectifier položky menu, manuálne vytvorte URL ako "
-#~ "v tomto príklade, položenie 73 vášho obrázka id:\n"
+#~ "Pre Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ ,"
+#~ "potrebujete iba aktuálne vstupné 'id'.\n"
+#~ "Pre pridanie Metacarta Map Rectifier položky menu, manuálne vytvorte URL "
+#~ "ako v tomto príklade, položenie 73 vášho obrázka id:\n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -35439,9 +35672,8 @@
 #~ "máte pochybnosti, nepoužite ich."
 
-#, java-format
 #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
-#~ msgstr "Chybná hlavička \"{0}\" nie je zhoda podľa očakávaného vzoru \"{1}\""
-
-#, java-format
+#~ msgstr ""
+#~ "Chybná hlavička \"{0}\" nie je zhoda podľa očakávaného vzoru \"{1}\""
+
 #~ msgid ""
 #~ "WARNING: launching browser windows for the first {0} of {1} selected "
@@ -35454,5 +35686,4 @@
 #~ msgstr "Neúspešná inicializácia API. Prosím skúste to znova pozdejšie ."
 
-#, java-format
 #~ msgid ""
 #~ "Current number of changes exceeds the max. number of changes, current is "
@@ -35462,23 +35693,20 @@
 #~ "{0}, maximálne je {1}"
 
-#, java-format
 #~ msgid "removing reference from way {0}"
 #~ msgstr "vybranie odkazu z cesty {0}"
 
-#, java-format
 #~ msgid ""
 #~ "<html>There are {0} primitives in your local dataset which<br>might be "
 #~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
-#~ "to check the state of these primitives<br>on the server.<br>Click "
+#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
+#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
 #~ "<strong>{2}</strong> to ignore.<br></html>"
 #~ msgstr ""
-#~ "<html>Je tam {0} pôvodných vo vašej lokálnej dátovej sade, ktoré<br>ktoré by "
-#~ "mohli byť zmazané zo servera. Ak pozdejšie skúsite zmazať, "
-#~ "alebo<br>aktualizovať ich server pravdepodobne "
-#~ "ohlási<br>konflikt.<br><br>Click <strong>{1}</strong>kontrola stavutýchto "
-#~ "pôvodných<br>na servery.<br>Click <strong>{2}</strong>ignorovať.<br></html>"
-
-#, java-format
+#~ "<html>Je tam {0} pôvodných vo vašej lokálnej dátovej sade, ktoré<br>ktoré "
+#~ "by mohli byť zmazané zo servera. Ak pozdejšie skúsite zmazať, "
+#~ "alebo<br>aktualizovať ich server pravdepodobne ohlási<br>konflikt."
+#~ "<br><br>Click <strong>{1}</strong>kontrola stavutýchto pôvodných<br>na "
+#~ "servery.<br>Click <strong>{2}</strong>ignorovať.<br></html>"
+
 #~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
 #~ msgstr "<html>Chybný priebeh nahrávania zo servera. Detaily:<br>{0}</html>"
@@ -35487,5 +35715,4 @@
 #~ msgstr "WGS84 Geographisch"
 
-#, java-format
 #~ msgid "Layer {0} must be in list of layers"
 #~ msgstr "Vrstva {0} musí byť v zozname vrstiev"
@@ -35494,5 +35721,4 @@
 #~ msgstr "Roztriediť vybrané relačné členy, alebo celý zoznam"
 
-#, java-format
 #~ msgid "Members: {0} (linked: {1})"
 #~ msgstr "Členy: {0} (spojenie: {1})"
@@ -35513,9 +35739,7 @@
 #~ msgstr "Pridať nový XML zdroj do zoznamu."
 
-#, java-format
 #~ msgid "The XML source (URL or filename) for {0} definition files."
 #~ msgstr "The XML zdroj (URL alebo názov súboru)pre {0} rozlíšenie súborov."
 
-#, java-format
 #~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
 #~ msgstr "Syntaktická chyba vzoru: Vzor {0} v {1} je nedovolený!"
@@ -35530,10 +35754,10 @@
 #~ msgstr "Konflikt je vytvorený"
 
-#, java-format
 #~ msgid ""
-#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}"
+#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: "
+#~ "{0}"
 #~ msgstr ""
-#~ "Chytená bezpečnostné výnimka pre setAlwaysOnTop().Ignorujem. Výnimka bola: "
-#~ "{0}"
+#~ "Chytená bezpečnostné výnimka pre setAlwaysOnTop().Ignorujem. Výnimka "
+#~ "bola: {0}"
 
 #~ msgid "Linked"
@@ -35543,5 +35767,4 @@
 #~ msgstr "INFORMÁCIA: zapísanie compatibilného režimu pre JOSM s Main.ds"
 
-#, java-format
 #~ msgid "Plug-in named {0} is not available. Update skipped."
 #~ msgstr "Plug-in {0} nie je dostupný. Aktualizácia preskočená."
@@ -35556,17 +35779,16 @@
 #~ "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
 #~ msgstr ""
-#~ "INFORMÁCIA: zapísanie compatibilného režimu pre JOSM s "
-#~ "Main.getCurrentDataSet()"
-
-#, java-format
+#~ "INFORMÁCIA: zapísanie compatibilného režimu pre JOSM s Main."
+#~ "getCurrentDataSet()"
+
 #~ msgid "Unknown file extension for file ''{0}''"
 #~ msgstr "Neznáme rozšírenie súboru pre súbor ''{0}''"
 
 #~ msgid ""
-#~ "Enable to upload all changes in one request, disable to use one request per "
-#~ "changed primitive"
+#~ "Enable to upload all changes in one request, disable to use one request "
+#~ "per changed primitive"
 #~ msgstr ""
-#~ "Umožniť nahranie všetkých zmien v jednej požiadavke, vypnúť použitie jednej "
-#~ "požiadavky na zmenené pôvodné"
+#~ "Umožniť nahranie všetkých zmien v jednej požiadavke, vypnúť použitie "
+#~ "jednej požiadavky na zmenené pôvodné"
 
 #~ msgid "Can't search because there is no loaded data."
@@ -35579,5 +35801,4 @@
 #~ msgstr "Dialóg ešte nie je vytvorený. Odvoláva sa na createInstance() first"
 
-#, java-format
 #~ msgid ""
 #~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
@@ -35592,15 +35813,13 @@
 #~ "Výnimka: {0}"
 
-#, java-format
 #~ msgid ""
 #~ "Warning: failed to bring extended dialog always on top. Exception: {0}"
 #~ msgstr ""
-#~ "Varovanie: neúspešné otvorenie rozšíreného dialógu vždy na vrchu. Výnimka: "
-#~ "{0}"
-
-#, java-format
+#~ "Varovanie: neúspešné otvorenie rozšíreného dialógu vždy na vrchu. "
+#~ "Výnimka: {0}"
+
 #~ msgid ""
-#~ "Warning: failed to put ''please wait dialog'' always on top. Exception was: "
-#~ "{0}"
+#~ "Warning: failed to put ''please wait dialog'' always on top. Exception "
+#~ "was: {0}"
 #~ msgstr ""
 #~ "Varovanie: neúspešná voľba zobraziť ''prosím počkajte'' vždy na vrchu. "
@@ -35610,5 +35829,4 @@
 #~ msgstr "Potvrdenie"
 
-#, java-format
 #~ msgid "Deleting layer {0} of {1}"
 #~ msgstr "Vymazávaná vrstva {0} z {1}"
@@ -35617,12 +35835,10 @@
 #~ msgstr "Zmazať všetko"
 
-#, java-format
 #~ msgid ""
 #~ "Warning: failed to put properties dialog always on top. Exception was: {0}"
 #~ msgstr ""
-#~ "Varovanie: neúspešné umiestnenie dialógového okna nastavení vždy na vrchu. "
-#~ "Výnimka bola: {0}"
-
-#, java-format
+#~ "Varovanie: neúspešné umiestnenie dialógového okna nastavení vždy na "
+#~ "vrchu. Výnimka bola: {0}"
+
 #~ msgid ""
 #~ "Warning: failed to put toggle dialog always on top. Exception was: {0}"
@@ -35631,9 +35847,8 @@
 #~ "Výnimka bola: {0}"
 
-#, java-format
 #~ msgid ""
-#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal to "
-#~ "deleting the roles of these primitives.<br>Do you really want to apply the "
-#~ "new role?</html>"
+#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
+#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
+#~ "the new role?</html>"
 #~ msgstr ""
 #~ "<html>Nastavujete prázdnu funkciu na {0} pôvodných.<br>Toto sa rovná "
@@ -35641,5 +35856,4 @@
 #~ "funkciu?</html>"
 
-#, java-format
 #~ msgid ""
 #~ "Warning: failed to put history browser always on top. Exception was: {0}"
@@ -35648,29 +35862,26 @@
 #~ "bola: {0}"
 
-#, java-format
 #~ msgid "Expected instance of OsmDataLayer. Got ''{0}''."
 #~ msgstr "Očakávaný príklad z OsmDataLayer. Got ''{0}''."
 
-#, java-format
 #~ msgid ""
 #~ "Failed to close changeset {0}, will be closed by server after timeout. "
 #~ "Exception was: {1}"
 #~ msgstr ""
-#~ "Neúspešné zatvorenie changeset {0}, budú zavreté po uplynutí časového limitu "
-#~ "servera. Výnimka bola: {1}"
+#~ "Neúspešné zatvorenie changeset {0}, budú zavreté po uplynutí časového "
+#~ "limitu servera. Výnimka bola: {1}"
 
 #~ msgid "The plugin could not be removed. Probably it was already disabled"
 #~ msgstr "Plugin nemôže byť odstránený. Pravdepodobne to bolo už vypnuté."
 
-#, java-format
 #~ msgid ""
 #~ "Loading of {0} plugin was requested. This plugin is no longer required."
 #~ msgstr ""
-#~ "Načítanie z {0} pluginov bolo požadované. Tento plugin nie je ďalej potrebný."
+#~ "Načítanie z {0} pluginov bolo požadované. Tento plugin nie je ďalej "
+#~ "potrebný."
 
 #~ msgid "Create non-audio markers when reading GPX."
 #~ msgstr "Vytvoriť bez zvukovej značky pri čítaní GPX."
 
-#, java-format
 #~ msgid ""
 #~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
@@ -35682,20 +35893,20 @@
 #~ "Vo vrstve sa nachádza neuložená {0} zmena. Nepoužiť zmenu a pokračovať?"
 #~ msgstr[2] ""
-#~ "Vo vrstve sa nachádzajú neuložených {0} zmien. Nepoužiť zmeny a pokračovať?"
+#~ "Vo vrstve sa nachádzajú neuložených {0} zmien. Nepoužiť zmeny a "
+#~ "pokračovať?"
 
 #~ msgid "Always move and don't show dialog again"
 #~ msgstr "Vždy posúvať a nezobrazovať znovu dialóg"
 
-#, java-format
 #~ msgid ""
 #~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
 #~ "relation?</html>"
 #~ msgstr ""
-#~ "<html>Výber \"{0}\" je použitý reláciou \"{1}\".<br>Zmazať z relácie?</html>"
-
-#, java-format
+#~ "<html>Výber \"{0}\" je použitý reláciou \"{1}\".<br>Zmazať z relácie?</"
+#~ "html>"
+
 #~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-#~ "from relation?</html>"
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
 #~ msgstr ""
 #~ "<html>Výber \"{0}\" je použitý reláciou \"{1}\" s úlohou {2}.<br>Zmazať z "
@@ -35708,5 +35919,4 @@
 #~ msgstr "Použite nový súbor zmien a zatvorte ho"
 
-#, java-format
 #~ msgid ""
 #~ "Select to upload to the existing changeset {0} and to leave the changeset "
@@ -35716,9 +35926,7 @@
 #~ "otvorený pre ďalšie nahratia"
 
-#, java-format
 #~ msgid "Use the existing changeset {0} and close it after upload"
 #~ msgstr "Použite existujúci súbor zmien {0} a zavrite ho po nahratí"
 
-#, java-format
 #~ msgid ""
 #~ "Select to upload to the existing changeset {0} and to close the changeset "
@@ -35728,18 +35936,16 @@
 #~ "tomto nahratí"
 
-#, java-format
 #~ msgid "Use the existing changeset {0} and leave it open"
 #~ msgstr "Použite existujúci súbor zmien {0} a nechajte ho otvorený"
 
-#, java-format
 #~ msgid ""
 #~ "<html>Failed to close changeset ''{0}'' on the OSM server ''{1}''.<br>The "
-#~ "changeset will automatically be closed by the server after a timeout.</html>"
+#~ "changeset will automatically be closed by the server after a timeout.</"
+#~ "html>"
 #~ msgstr ""
-#~ "<html>Neúspešné zatváranie súboru zmien ''{0}'' na OSM servery "
-#~ "''{1}''.<br>The súbor zmien bude automaticky zavretý na servery po vypršaní "
+#~ "<html>Neúspešné zatváranie súboru zmien ''{0}'' na OSM servery ''{1}''."
+#~ "<br>The súbor zmien bude automaticky zavretý na servery po vypršaní "
 #~ "časového limitu.</html>"
 
-#, java-format
 #~ msgid "Changeset {0} is unchanged. Skipping update."
 #~ msgstr "Súbor zmien {0} je nezmenený. Ukončujem aktualizáciu."
@@ -35748,11 +35954,10 @@
 #~ msgstr "Teraz nie je otvorený súbor zmien. Otváram nový súbor zmien..."
 
-#, java-format
 #~ msgid "Reusing existing changeset {0}"
 #~ msgstr "Znovu použitý existujúci súbor zmien {0}"
 
 #~ msgid ""
-#~ "Warning: could not reuse an existing changeset as requested. Opening a new "
-#~ "one."
+#~ "Warning: could not reuse an existing changeset as requested. Opening a "
+#~ "new one."
 #~ msgstr ""
 #~ "Varovanie: nemôžem znovu použiť nejaký existujúci súbor zmien pokiaľ bol "
@@ -35760,13 +35965,13 @@
 
 #~ msgid ""
-#~ "Failed to update changeset. Either there is no current changeset or the id "
-#~ "of the current changeset is 0"
+#~ "Failed to update changeset. Either there is no current changeset or the "
+#~ "id of the current changeset is 0"
 #~ msgstr ""
-#~ "Neúspešná aktualizácia súboru zmien. Nachádza sa tu neaktuálny súbor zmien, "
-#~ "alebo id aktuálneho súboru zmien je 0"
+#~ "Neúspešná aktualizácia súboru zmien. Nachádza sa tu neaktuálny súbor "
+#~ "zmien, alebo id aktuálneho súboru zmien je 0"
 
 #~ msgid ""
-#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
-#~ "the following\n"
+#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to "
+#~ "add the following\n"
 #~ "      Java option to increase the maximum size of allocated memory"
 #~ msgstr ""
@@ -35778,11 +35983,10 @@
 #~ msgstr "ešte žiadne rozhodnutie"
 
-#, java-format
 #~ msgid ""
 #~ "<html>Failed to create an URL because the encoding ''{0}'' was<br>was "
 #~ "missing on this system.</html>"
 #~ msgstr ""
-#~ "<html>Neúspešné vytvorenie URL pretože šifrovanie ''{0}'' bolo<br>chýbalo v "
-#~ "tomto systéme.</html>"
+#~ "<html>Neúspešné vytvorenie URL pretože šifrovanie ''{0}'' bolo<br>chýbalo "
+#~ "v tomto systéme.</html>"
 
 #~ msgid "Set "
@@ -35792,13 +35996,11 @@
 #~ msgstr "Bicykle"
 
-#, java-format
 #~ msgid ""
 #~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
 #~ "resolve them first.</html>"
 #~ msgstr ""
-#~ "<html>Vo vrstve sa nachádzajú nevyriešené konflikty ''{0}''.<br>Najskôr ich "
-#~ "vyriešte.</html>"
-
-#, java-format
+#~ "<html>Vo vrstve sa nachádzajú nevyriešené konflikty ''{0}''.<br>Najskôr "
+#~ "ich vyriešte.</html>"
+
 #~ msgid "paramete''{0}'' must not be null"
 #~ msgstr "parameter''{0}'' nesmie byť nula"
@@ -35815,24 +36017,22 @@
 #~ "Hold left mousebutton and draw a frame."
 #~ msgstr ""
-#~ "<b>Zväčšenie:</b> Kolieskom myši, dvojklik alebo Ctrl + Hore(Up)/Dole(Down) "
-#~ "<b>Posun mapy:</b> Podržať pravé tlačítko myši a pohnúť myšou, alebo použiť "
-#~ "kurzorové klávesy. <b>Výber:</b> Podržať ľavé tlačítko myši a nakresliť rám."
-
-#, java-format
+#~ "<b>Zväčšenie:</b> Kolieskom myši, dvojklik alebo Ctrl + Hore(Up)/Dole"
+#~ "(Down) <b>Posun mapy:</b> Podržať pravé tlačítko myši a pohnúť myšou, "
+#~ "alebo použiť kurzorové klávesy. <b>Výber:</b> Podržať ľavé tlačítko myši "
+#~ "a nakresliť rám."
+
 #~ msgid "Missing mandatory attribute ''{0}''"
 #~ msgstr "Chýba povinný atribút ''{0}''"
 
-#, java-format
 #~ msgid ""
-#~ "WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-#~ "version is ''0.5''. Got {1}"
+#~ "WARNING: normalizing value of attribute ''version'' of element {0} to 0, "
+#~ "API version is ''0.5''. Got {1}"
 #~ msgstr ""
-#~ "VERZIA: štandardná hodnota vlastnosti ''verzia'' z elementu {0} pre 0, API "
-#~ "verziu je ''0.5''. Got {1}"
-
-#, java-format
+#~ "VERZIA: štandardná hodnota vlastnosti ''verzia'' z elementu {0} pre 0, "
+#~ "API verziu je ''0.5''. Got {1}"
+
 #~ msgid ""
-#~ "WARNING: normalizing value of attribute ''version'' of element {0} to 1, API "
-#~ "version is ''0.5''. Got {1}"
+#~ "WARNING: normalizing value of attribute ''version'' of element {0} to 1, "
+#~ "API version is ''0.5''. Got {1}"
 #~ msgstr ""
 #~ "VAROVANIE: štandardná hodnota vlastnosti ''verzia'' z elementu {0} pre 1, "
@@ -35840,6 +36040,6 @@
 
 #~ msgid ""
-#~ "WARNING: no API version defined for data to upload. Falling back to version "
-#~ "0.6"
+#~ "WARNING: no API version defined for data to upload. Falling back to "
+#~ "version 0.6"
 #~ msgstr ""
 #~ "VAROVANIE: žiadna API verzia vymedzená pre dáta na nahratie. Ustúpiť do "
@@ -35852,5 +36052,4 @@
 #~ msgstr "Uplatniť tiež pre deti(children)"
 
-#, java-format
 #~ msgid "Preset group ''{0}'' of group ''{1}''"
 #~ msgstr "Prednastavená skupina ''{0}'' zo skupiny ''{1}''"
@@ -35859,32 +36058,26 @@
 #~ msgstr "Chyba: neúspešné pridanie poverovacej autentifikácie pre spojenie."
 
-#, java-format
 #~ msgid "Relation: from {0} to {1} via {2}"
 #~ msgstr "Relácia: z {0} do {1} sprostredkujúca(via) {2}"
 
-#, java-format
 #~ msgid "{0} extrem nodes."
 #~ msgstr "{0} hraničné(extrem) body."
 
-#, java-format
 #~ msgid "Via node {0}, {1}"
 #~ msgstr "Sprostredkujúce(Via) body {0}, {1}"
 
-#, java-format
 #~ msgid "MIddle way: {0}"
 #~ msgstr "Stred(MIddle) cesty: {0}"
 
-#, java-format
 #~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr ""
 #~ "Chýbajúca stránka s pomocou. Vytvorte to v <A HREF=\"{0}\">English</A>."
 
-#, java-format
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
 #~ msgstr ""
-#~ "Chýbajúca stránka s pomocou. Vytvorte to v  <A HREF=\"{0}\">English</A> or "
-#~ "<A HREF=\"{1}\">váš jazyk</A>."
+#~ "Chýbajúca stránka s pomocou. Vytvorte to v  <A HREF=\"{0}\">English</A> "
+#~ "or <A HREF=\"{1}\">váš jazyk</A>."
 
 #~ msgid "Didn't find an primitive with id {0} in this dataset"
@@ -35896,38 +36089,31 @@
 
 #~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
 #~ msgstr ""
-#~ "Stránka s nápovedou chýba. Vytvorte to v <A HREF=\"{0}\">English</A> alebo "
-#~ "<A HREF=\"{1}\">váš jazyk</A>."
+#~ "Stránka s nápovedou chýba. Vytvorte to v <A HREF=\"{0}\">English</A> "
+#~ "alebo <A HREF=\"{1}\">váš jazyk</A>."
 
 #~ msgid "Current changeset is null. Can't upload data."
 #~ msgstr "Aktuálny zmenový súbor ja prázdny. Nemôžem nahrať dáta."
 
-#, java-format
 #~ msgid "Parameter ''{0}'' must not be null."
 #~ msgstr "parameter ''{0}'' nesmie byť nulový"
 
-#, java-format
 #~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 #~ msgstr "očakávaný príklad z OsmDataLayer alebo GpxLayer. Got ''{0}''."
 
-#, java-format
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "neočakávaná hodnota. Dostal {0}"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
 #~ msgstr "parameter {0} > 0 požadovaný. Dostal {1}."
 
-#, java-format
 #~ msgid "Expected ID >= 0. Got {0}."
 #~ msgstr "očekávané id >= 0. Got {0}"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
 #~ msgstr "parameter ''{0}'' je nesprávny typ mena, dostava ''{1}''"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 #~ msgstr "parameter ''{0}''je neprijateľná trieda, dostáva ''{1}''"
@@ -35939,5 +36125,4 @@
 #~ msgstr "Nie je tam platná verzia pri dátume ''{0}'' v tejto histórii"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 #~ msgstr "parameter ''{0}'' v rozsahu 0..{1} očakávaný, dostáva {2}"
@@ -35949,26 +36134,20 @@
 #~ msgstr "nenájdená staršia verzia. História je prázdna."
 
-#, java-format
 #~ msgid "Parameter current out of range. Got {0}."
 #~ msgstr "aktuálny parameter je mimo rozsahu: got {0}"
 
-#, java-format
 #~ msgid "Unexpected column index. Got {0}."
 #~ msgstr "neočakávaný index stĺpca. Got {0}"
 
-#, java-format
 #~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
 #~ msgstr "Parameter 'col'  musí byť 0 alebo 1. Got {0}"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' must not be empty."
 #~ msgstr "parameter ''{0}'' nemôže byť prázdny"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 #~ msgstr ""
 #~ "parameter ''{0}'' je očakávaný so značkami pre presne jeden kľúč. Got {1}"
 
-#, java-format
 #~ msgid "Index out of bounds. Got {0}."
 #~ msgstr "index je mimo hranice Dostať {0}"
@@ -35977,17 +36156,13 @@
 #~ msgstr "Zobraziť priebeh z vybraných pôvodných"
 
-#, java-format
 #~ msgid "Value of child.getId() > 0 expected. Got {1}."
 #~ msgstr "child.getId() >0 očakávaný. Got {1}"
 
-#, java-format
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Nemôžem čítať \"{0}\""
 
-#, java-format
 #~ msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 #~ msgstr "Neplatná hodnota pre vlastnosť ''uid''. Got ''{0}''"
 
-#, java-format
 #~ msgid ""
 #~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
@@ -35995,37 +36170,33 @@
 #~ "nedovolená hodnota pre povinný atribút ''{0}'' typu int, dostáva ''{1}''"
 
-#, java-format
 #~ msgid ""
-#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
+#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got "
+#~ "''{1}''."
 #~ msgstr ""
 #~ "nedovolená hodnota pre povinný atribút ''{0}''  typu int (>=0), dostáva "
 #~ "''{1}''"
 
-#, java-format
 #~ msgid ""
 #~ "Unknown relation member type ''{0}'' in relation with external id ''{1}''."
 #~ msgstr "Neznámy typ relačného člena ''{0}'' v relácii s eterným id ''{1}''"
 
-#, java-format
 #~ msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 #~ msgstr "id parameter ''{0}'' > 0 požadovaný. Got {1}"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 #~ msgstr "parameter ''{0}'' >= 0 očakávaný, dostáva ''{1}''"
 
-#, java-format
 #~ msgid ""
 #~ "WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
-#~ "use diff uploads, but API is not able to handle them. Ignoring diff upload."
+#~ "use diff uploads, but API is not able to handle them. Ignoring diff "
+#~ "upload."
 #~ msgstr ""
 #~ "Varovanie: nastavenie ''{0}'' alebo api verzia ''{1}'' z dátovej sady "
-#~ "požadujú použiť rozdielne nahratie , ale API nie je schopného "
-#~ "ovládať.Ignorujem rozdielne nahrávanie."
-
-#, java-format
+#~ "požadujú použiť rozdielne nahratie , ale API nie je schopného ovládať."
+#~ "Ignorujem rozdielne nahrávanie."
+
 #~ msgid ""
-#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
-#~ "default geometry. Details: {1}"
+#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back "
+#~ "to default geometry. Details: {1}"
 #~ msgstr ""
 #~ "Varovanie: neúspešná obnova geometrie okna z kľúča ''{0}''. Ustupujem pre "
@@ -36033,18 +36204,16 @@
 
 #~ msgid ""
-#~ "Several utilities that make your life easier: e.g. simplify way, join areas, "
-#~ "jump to position."
+#~ "Several utilities that make your life easier: e.g. simplify way, join "
+#~ "areas, jump to position."
 #~ msgstr ""
 #~ "Niekoľko pomôcok(utilities) ktoré vám uľahčia život(prácu): napr. "
 #~ "zjednodušenie cesty, spojiť plochy, skok na pozíciu."
 
-#, java-format
 #~ msgid ""
 #~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
 #~ msgstr ""
-#~ "Nemôžem obnoviť(undo) príkaz ''{0}'' pretože vrstva ''{1}'' už viac nie je "
-#~ "prítomná."
-
-#, java-format
+#~ "Nemôžem obnoviť(undo) príkaz ''{0}'' pretože vrstva ''{1}'' už viac nie "
+#~ "je prítomná."
+
 #~ msgid ""
 #~ "The OSM server ''{0}'' doesn't know about an object<br>you tried to read, "
@@ -36076,5 +36245,4 @@
 #~ msgstr "Zoskupiť bežné Address Interpolation vstupy do jedného dialógu."
 
-#, java-format
 #~ msgid "Uploading {0} objects ..."
 #~ msgstr "Nahrávam {0} objekty(ov) ..."
@@ -36083,21 +36251,17 @@
 #~ msgstr "Zlý počet údajov(parametrov) pre operátor značiek."
 
-#, java-format
 #~ msgid "Parameter ''{0}'' must not be empty"
 #~ msgstr "Údaj(parameter) ''{0}'' nesmie byť prázdny"
 
-#, java-format
 #~ msgid ""
-#~ "Incorrect value of tags operator: {0}. Tags operator expects number of tags "
-#~ "or range, for example tags:1 or tags:2-5"
+#~ "Incorrect value of tags operator: {0}. Tags operator expects number of "
+#~ "tags or range, for example tags:1 or tags:2-5"
 #~ msgstr ""
-#~ "Nesprávna hodnota z operátora značiek: {0}. Operátor značiek očakáva číslo "
-#~ "zo značiek alebo rozsahu, napríklad značky:1 alebo značky:2-5"
-
-#, java-format
+#~ "Nesprávna hodnota z operátora značiek: {0}. Operátor značiek očakáva "
+#~ "číslo zo značiek alebo rozsahu, napríklad značky:1 alebo značky:2-5"
+
 #~ msgid "Illegal double value ''{0}''"
 #~ msgstr "Nedovolená zdvojená hodnota ''{0}''"
 
-#, java-format
 #~ msgid "Failed to load load resource ''{0}''. Error is {1}"
 #~ msgstr "Nesprávne načítanie čítacieho prostriedku ''{0}''. Chyba je {1}"
@@ -36110,5 +36274,4 @@
 #~ "Neúspešné načítanie príkazu. Ukončujem prehliadač pre pomoc. Výnimka bola:"
 
-#, java-format
 #~ msgid "{0} Plugin successfully downloaded."
 #~ msgid_plural "{0} Plugins successfully downloaded."
@@ -36125,17 +36288,17 @@
 #~ msgid "At least one object to delete requird, got empty collection"
 #~ msgstr ""
-#~ "Prázdna množina objektov, na zmazanie je potrebné vybrať aspoň jeden objekt"
+#~ "Prázdna množina objektov, na zmazanie je potrebné vybrať aspoň jeden "
+#~ "objekt"
 
 #~ msgid "null detected in node list"
 #~ msgstr "prázdny zoznam bodov"
 
-#, java-format
 #~ msgid ""
-#~ "<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-#~ "network problem, please check your<br>your internet connection</html>"
+#~ "<html>Failed to open help page for url {0}.<br>This is most likely due to "
+#~ "a network problem, please check your<br>your internet connection</html>"
 #~ msgstr ""
-#~ "<html>Neúspešné otvorenie stránky pomoci z url {0}.<br>Je to pravdepodobne "
-#~ "spôsobené problémom v sieti, prosím skontrolujte váš<br>vaše internetové "
-#~ "pripojenie</html>"
+#~ "<html>Neúspešné otvorenie stránky pomoci z url {0}.<br>Je to "
+#~ "pravdepodobne spôsobené problémom v sieti, prosím skontrolujte "
+#~ "váš<br>vaše internetové pripojenie</html>"
 
 #~ msgid "User with the same uid but different name found"
@@ -36143,28 +36306,28 @@
 
 #~ msgid ""
-#~ "<html>The combined ways are members in one ore more relations. Please decide "
-#~ "whether your want to <strong>keep</strong> these memberships for the "
-#~ "combined way or whether you want to <strong>remove</strong> them.<br>The "
-#~ "default is to <strong>keep</strong> them: the combined way will take the "
-#~ "place of the original way in the membership.</html>"
+#~ "<html>The combined ways are members in one ore more relations. Please "
+#~ "decide whether your want to <strong>keep</strong> these memberships for "
+#~ "the combined way or whether you want to <strong>remove</strong> them."
+#~ "<br>The default is to <strong>keep</strong> them: the combined way will "
+#~ "take the place of the original way in the membership.</html>"
 #~ msgstr ""
 #~ "<html>Spojené cesty sú členmi v jednej, alebo viacerých reláciách. Prosím "
-#~ "rozhodnite, či chcete <strong>zachovať</strong> tieto členstvá pre spojenú "
-#~ "cestu, alebo či chcete <strong>odstrániť</strong> ich.<br>Štandardne je "
-#~ "<strong>zachovať</strong> ich: spojená cesta zaujme miesto pôvodnej cesty v "
-#~ "členoch.</html>"
+#~ "rozhodnite, či chcete <strong>zachovať</strong> tieto členstvá pre "
+#~ "spojenú cestu, alebo či chcete <strong>odstrániť</strong> ich."
+#~ "<br>Štandardne je <strong>zachovať</strong> ich: spojená cesta zaujme "
+#~ "miesto pôvodnej cesty v členoch.</html>"
 
 #~ msgid ""
-#~ "<html>The merged nodes are members in one ore more relations. Please decide "
-#~ "whether your want to <strong>keep</strong> these memberships for the target "
-#~ "node or whether you want to <strong>remove</strong> them.<br>The default is "
-#~ "to <strong>keep</strong> them: the target node will take the place of the "
-#~ "original node in the membership.</html>"
+#~ "<html>The merged nodes are members in one ore more relations. Please "
+#~ "decide whether your want to <strong>keep</strong> these memberships for "
+#~ "the target node or whether you want to <strong>remove</strong> them."
+#~ "<br>The default is to <strong>keep</strong> them: the target node will "
+#~ "take the place of the original node in the membership.</html>"
 #~ msgstr ""
 #~ "<html>Združené body sú členmi v jednej, alebo viacerých reláciách. Prosím "
-#~ "rozhodnite, či chcete <strong>zachovať</strong> tieto členstvá pre cieľový "
-#~ "bod, alebo či chcete <strong>odstrániť</strong> ich.<br>Štandardne je "
-#~ "<strong>zachovať</strong> ich: cieľový bod zaujme miesto pôvodného bodu v "
-#~ "členoch.</html>"
+#~ "rozhodnite, či chcete <strong>zachovať</strong> tieto členstvá pre "
+#~ "cieľový bod, alebo či chcete <strong>odstrániť</strong> ich."
+#~ "<br>Štandardne je <strong>zachovať</strong> ich: cieľový bod zaujme "
+#~ "miesto pôvodného bodu v členoch.</html>"
 
 #~ msgid "Could not create a node with the entered latitude/longitude."
@@ -36174,29 +36337,22 @@
 #~ msgstr "Vyhľadávanie dostupných prekladov..."
 
-#, java-format
 #~ msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
 #~ msgstr "Parameter ''{0}'' > 0.0 očakávaný, dostal som {1}"
 
-#, java-format
 #~ msgid "Expected array of length 4, got {0}"
 #~ msgstr "Očakávaná dĺžka sady 4. dostal som {0}"
 
-#, java-format
 #~ msgid "Id > 0 required, got {0}"
 #~ msgstr "vyžadované Id > 0, dostal som {0}"
 
-#, java-format
 #~ msgid "Object id > 0 expected. Got {0}"
 #~ msgstr "Objekt id > 0 očakávaný. Dostal som {0}"
 
-#, java-format
 #~ msgid "id in parameter ''{0}'' > 0 expected, got {1}."
 #~ msgstr "id s parametrom ''{0}'' > 0 očakávaný. dostal som {1}."
 
-#, java-format
 #~ msgid "Parameter ''{0}'' > 0 expected. Got {1}."
 #~ msgstr "Parameter ''{0}'' > 0 očakávaný. Dostal som {1}."
 
-#, java-format
 #~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
 #~ msgstr "Parameter ''{0}'' > 0 očakávaný, dostal som {1}"
@@ -36208,9 +36364,7 @@
 #~ msgstr "Kontrolujem lokality..."
 
-#, java-format
 #~ msgid "Expected value > 0 for parameter ''{0}'', got {1}"
 #~ msgstr "Očakávaná hodnota > 0 pre parameter ''{0}'', dostal som {1}"
 
-#, java-format
 #~ msgid "Delete old plugin file {0}"
 #~ msgstr "Zmazať staršie súbory pluginov {0}"
@@ -36235,12 +36389,9 @@
 #~ msgstr "GPS bod"
 
-#~ msgid "Point on angle of building to start drawing"
-#~ msgstr "Bod na rohu budovy, na začiatok kreslenia"
-
 #~ msgid ""
 #~ "Automaticly select first WMS layer when grabing if multiple layers exist."
 #~ msgstr ""
-#~ "Automaticky vyberte najprv WMS vrstvu pre zachytávanie(grabing), ak existuje "
-#~ "viac vrstiev."
+#~ "Automaticky vyberte najprv WMS vrstvu pre zachytávanie(grabing), ak "
+#~ "existuje viac vrstiev."
 
 #~ msgid "Multipolygon inner way is outside."
Index: /applications/editors/josm/i18n/po/sl.po
===================================================================
--- /applications/editors/josm/i18n/po/sl.po	(revision 21970)
+++ /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"
Index: /applications/editors/josm/i18n/po/sv.po
===================================================================
--- /applications/editors/josm/i18n/po/sv.po	(revision 21970)
+++ /applications/editors/josm/i18n/po/sv.po	(revision 21971)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-15 17:35+0200\n"
+"POT-Creation-Date: 2010-06-23 22:47+0200\n"
 "PO-Revision-Date: 2010-06-07 08:48+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-06-15 16:20+0000\n"
+"X-Launchpad-Export-Date: 2010-06-23 20:24+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -23,5 +23,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
@@ -93,5 +93,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
@@ -252,5 +252,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
@@ -273,5 +273,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
@@ -279,6 +279,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
@@ -287,4 +289,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
@@ -322,9 +326,9 @@
 #, java-format
 msgid ""
-"<html>There are no layers the source layer<br>''{0}''<br>could be merged "
-"to.</html>"
-msgstr ""
-"<html>Det finns inga lager som lagret <br>''{0}''<br>kan sammanfogas "
-"med.</html>"
+"<html>There are no layers the source layer<br>''{0}''<br>could be merged to."
+"</html>"
+msgstr ""
+"<html>Det finns inga lager som lagret <br>''{0}''<br>kan sammanfogas med.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:81
@@ -347,9 +351,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
@@ -409,4 +413,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
@@ -446,5 +451,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 "Information"
@@ -658,5 +663,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
@@ -671,5 +676,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 "Ta bort"
@@ -919,4 +924,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 ""
@@ -927,4 +933,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 "Detta kan leda till att noder raderas av misstag."
@@ -1025,6 +1032,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
 msgid "Opens a dialog that allows to jump to a specific location"
-msgstr ""
-"Öppnar en dialogruta som gör att man kan gå direkt till en viss plats"
+msgstr "Öppnar en dialogruta som gör att man kan gå direkt till en viss plats"
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:57
@@ -1493,6 +1499,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
@@ -1519,4 +1525,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
@@ -1525,6 +1533,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 "Fel"
@@ -1640,6 +1648,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 ""
 "Visa statusrapport med information som kan vara av nytta vid felrapportering."
@@ -1676,8 +1683,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 "Ja, radera noder"
 
 #: ../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 "Radera noder utanför de hämtade dataområdena"
@@ -1686,5 +1695,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 "Nej, avbryt"
@@ -1692,16 +1702,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 "Avbryt åtgärden"
 
 #: ../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 "Vill du radera dem ändå?"
 
 #: ../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 "Radera noder utanför dataområdena?"
 
 #: ../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 "Välj åtminstone en sträcka att förenkla."
@@ -1710,13 +1725,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 "Ja"
 
 #: ../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 "Förenkla alla valda vägar"
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:126
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:89
 #, java-format
 msgid ""
@@ -1726,8 +1744,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 "Förenkla vägar?"
 
 #: ../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"
@@ -1737,4 +1757,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)"
@@ -1804,6 +1825,6 @@
 "should verify this and correct it when necessary.</html>"
 msgstr ""
-"<html>Ett rollbaserat relationsmedlemskap kopierades till alla nya "
-"vägar.<br>Du bör verifiera detta och korrigera om nödvändigt.</html>"
+"<html>Ett rollbaserat relationsmedlemskap kopierades till alla nya vägar."
+"<br>Du bör verifiera detta och korrigera om nödvändigt.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
@@ -1812,6 +1833,6 @@
 "this and correct it when necessary.</html>"
 msgstr ""
-"<html>Ett rollbaserat relationsmedlemskap kopierades till alla nya "
-"vägar.<br>Du bör verifiera detta och korrigera om nödvändigt.</html>"
+"<html>Ett rollbaserat relationsmedlemskap kopierades till alla nya vägar."
+"<br>Du bör verifiera detta och korrigera om nödvändigt.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
@@ -1872,6 +1893,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 ""
 "* En nod som används av mer än en sträcka samt en av dessa sträckor, eller"
@@ -1947,9 +1967,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)"
@@ -1966,5 +1986,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
@@ -2028,5 +2048,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 "Det finns inte några ändringar att skicka in."
@@ -2044,14 +2063,14 @@
 msgstr "Ladda upp alla ändringar i nuvarande val till OSM-servern"
 
-#: ../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 "Kontrollerar föräldrar för raderade objekt"
 
-#: ../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 "Läser föräldrar till \"{0}\""
 
-#: ../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 "Söker efter raderade föräldrar i det lokaka datasetet"
@@ -2184,6 +2203,5 @@
 msgid ""
 "Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr ""
-"Ignorerar undantag eftersom hämtningen avbrutits. Undantaget var: {0}"
+msgstr "Ignorerar undantag eftersom hämtningen avbrutits. Undantaget var: {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:142
@@ -2309,5 +2327,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
@@ -2426,6 +2444,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
 msgid ""
-"Drag play head and release near track to play audio from there; "
-"SHIFT+release to synchronize audio at that point."
+"Drag play head and release near track to play audio from there; SHIFT"
+"+release to synchronize audio at that point."
 msgstr ""
 "Dra spelhuvudet och släpp i närheten av spår för att spela upp ljud "
@@ -2564,5 +2582,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."
@@ -2690,9 +2708,9 @@
 #: ../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)"
-msgstr ""
-"<b>nodes:</b>... - objekt med angivet antal noder (nodes:antal eller "
-"nodes:min-max)"
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
+"min-max)"
+msgstr ""
+"<b>nodes:</b>... - objekt med angivet antal noder (nodes:antal eller nodes:"
+"min-max)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
@@ -2757,6 +2775,6 @@
 "escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
 msgstr ""
-"I citerade strängar behöver <b>\"</b> och <b>\\</b> föregås av ett <b>\\"
-"</b>. (Dvs. <b>\\\"</b> och <b>\\\\</b>)."
+"I citerade strängar behöver <b>\"</b> och <b>\\</b> föregås av ett <b>\\</"
+"b>. (Dvs. <b>\\\"</b> och <b>\\\\</b>)."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
@@ -2863,6 +2881,5 @@
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
-msgstr ""
-"Okänd primitivtyp: {0}. Tillåtna värden är nod, sträcka eller relation"
+msgstr "Okänd primitivtyp: {0}. Tillåtna värden är nod, sträcka eller relation"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
@@ -2970,10 +2987,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
@@ -3095,5 +3116,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
@@ -3173,7 +3194,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 ""
 "Du håller på att ta bort noder utanför det område som du har hämtat hem.<br> "
@@ -3222,11 +3243,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"
@@ -3235,5 +3256,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 #, java-format
 msgid ""
@@ -3242,5 +3263,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}"
@@ -3448,6 +3469,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 ""
 
@@ -3530,5 +3551,5 @@
 #. *
 #. * the decimal format 999.999
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3537,5 +3558,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3544,5 +3565,5 @@
 #. *
 #. * coordinates East/North
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3589,4 +3610,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}"
@@ -3598,29 +3622,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 ""
 
@@ -3699,19 +3717,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 ""
@@ -3720,5 +3738,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 "
@@ -3726,5 +3744,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 ""
@@ -3780,6 +3798,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 ""
 
@@ -3794,5 +3811,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 "markerad"
@@ -3956,6 +3973,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 ""
 
@@ -4026,5 +4042,5 @@
 #. color tiger_data
 #. </rule>
-#. 
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4034,5 +4050,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4041,5 +4057,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4048,5 +4064,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4055,5 +4071,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4062,5 +4078,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4069,9 +4085,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--annotation tags -->
-#. 
+#.
 #. <!--"work in progress" tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="building"/>
@@ -4080,5 +4096,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 "byggnad (building)"
@@ -4165,5 +4181,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
@@ -4214,6 +4230,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
-msgstr ""
-"Ändra storleken på appleten till angiven geometri (format: BREDDxHÖJD)"
+msgstr "Ändra storleken på appleten till angiven geometri (format: BREDDxHÖJD)"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
@@ -4253,6 +4268,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "If specified, reset the configuration instead of reading it."
-msgstr ""
-"Om angivet så återställ konfigurationen istället för att läsa in den."
+msgstr "Om angivet så återställ konfigurationen istället för att läsa in den."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
@@ -4391,5 +4405,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
@@ -4398,4 +4412,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
@@ -4595,5 +4610,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
@@ -4632,6 +4647,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 ""
 
@@ -4662,5 +4677,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"
@@ -4669,5 +4684,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"
@@ -4676,5 +4691,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"
@@ -4888,6 +4903,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 ""
 
@@ -4967,6 +4981,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 ""
 
@@ -4974,6 +4988,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 ""
 
@@ -5024,6 +5038,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 ""
 
@@ -5240,10 +5254,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"
@@ -5252,10 +5268,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
@@ -5337,4 +5355,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 "inget"
@@ -5551,7 +5570,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 ""
 
@@ -5576,6 +5595,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 ""
 
@@ -5621,5 +5639,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
@@ -5668,6 +5686,5 @@
 msgid ""
 "Set the selected elements on the map to the selected items in the list above."
-msgstr ""
-"Sätt urval av element på kartan till de valda posterna i listan ovan."
+msgstr "Sätt urval av element på kartan till de valda posterna i listan ovan."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
@@ -5694,10 +5711,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 ""
 
@@ -5720,5 +5736,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
@@ -5726,5 +5742,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 "Lägg till"
@@ -5773,5 +5789,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 "Historik"
@@ -5991,10 +6007,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 ""
@@ -7451,6 +7467,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 ""
 
@@ -7474,8 +7490,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 ""
 
@@ -7595,9 +7611,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 "Lägg till egenskaper"
 
-#: ../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."
@@ -7606,23 +7622,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 "<olika>"
 
-#: ../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 "Ändra värden?"
 
-#: ../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"
@@ -7631,5 +7647,5 @@
 msgstr[1] "Ändra egenskaper för upp till {0} objekt."
 
-#: ../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."
@@ -7638,77 +7654,77 @@
 msgstr[1] "Detta kommer att ändra upp till {0} objekt."
 
-#: ../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 "Välj en nyckel"
 
-#: ../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 "Välj ett värde"
 
-#: ../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 "Välj de objekt vars egenskaper du vill ändra."
 
-#: ../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 "Egenskaper/Roller"
 
-#: ../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 "Egenskaper för valda objekt."
 
 #. 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 "Medlem av"
 
-#: ../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 "Egenskaper: {0} / Medlemskap: {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 "Egenskaper / Roller"
 
-#: ../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 "Ändra relation"
 
-#: ../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 "Ta bort från relation"
 
-#: ../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 "Verkligen ta bort det valda från relation {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 "Ta bort den valda nyckeln från alla objekt."
 
-#: ../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 "Ta bort egenskaper"
 
-#: ../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 "Lägg till ett nytt nyckel/värde-par till alla objekt."
 
-#: ../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 "Redigera värdet av den valda nyckeln för alla objekt."
 
-#: ../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 ""
@@ -7823,6 +7839,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 ""
 
@@ -7840,6 +7856,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 ""
 
@@ -7994,7 +8010,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 ""
 
@@ -8307,6 +8322,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222
 msgid "Download area too large; will probably be rejected by server"
-msgstr ""
-"Hämtningsområdet är alltför stort; kommer troligen avvisas av servern."
+msgstr "Hämtningsområdet är alltför stort; kommer troligen avvisas av servern."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225
@@ -8330,7 +8344,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 ""
 
@@ -8471,6 +8484,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 ""
 
@@ -8480,6 +8493,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 ""
 
@@ -8753,9 +8766,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 ""
 
@@ -8770,14 +8782,13 @@
 msgid ""
 "<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click "
-"<strong>{0}</strong> to synchronize the entire local dataset with the "
-"server.<br>Click <strong>{1}</strong> to abort and continue "
-"editing.<br></html>"
+"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
+"</strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{1}</strong> to abort and continue editing.<br></html>"
 msgstr ""
 "<html>Uppladdning <strong>misslyckades</strong eftersom servern har en nyare "
 "version<br>av någon av dina noder, vägar eller relationer.<br><br>Klicka på "
-"<strong>{0}</strong> för att synkronisera all lokal data med "
-"servern.<br>Klicka på <strong>{1}</strong> för att avbryta och fortsätta "
-"redigera.<br></html>"
+"<strong>{0}</strong> för att synkronisera all lokal data med servern."
+"<br>Klicka på <strong>{1}</strong> för att avbryta och fortsätta redigera."
+"<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194
@@ -9022,5 +9033,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 ""
@@ -9028,6 +9039,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 ""
 
@@ -9112,6 +9122,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] ""
@@ -9125,6 +9135,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 "
@@ -9350,5 +9360,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9374,6 +9384,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 ""
 
@@ -9428,6 +9437,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 ""
 
@@ -9481,7 +9490,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 ""
 
@@ -9491,5 +9500,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9505,5 +9514,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..."
@@ -9514,6 +9523,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 ""
 
@@ -9731,7 +9739,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 ""
 
@@ -9757,7 +9765,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 ""
 
@@ -9821,6 +9829,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 ""
 "<html>Det anses skadligt att skicka in obehandlad GPS-data.<br>Om du vill "
@@ -10004,6 +10012,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 ""
 
@@ -10063,7 +10071,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 ""
 "<html>Ta ett foto av din GPS-mottagare när den visar tiden.<br>Visa detta "
@@ -10652,6 +10660,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 ""
 
@@ -10673,8 +10681,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 ""
 
@@ -10794,6 +10802,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 ""
 
@@ -10903,6 +10911,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 ""
 
@@ -11036,8 +11043,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 ""
 
@@ -11120,8 +11127,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 ""
 
@@ -11148,7 +11155,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 ""
 
@@ -11200,5 +11207,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 "Välj vilken rad du vill ta bort."
@@ -11227,6 +11234,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
 msgid "Explicit waypoints with time estimated from track position."
-msgstr ""
-"Explicita sträckpunkter med tid uppskattad från position längs spåret."
+msgstr "Explicita sträckpunkter med tid uppskattad från position längs spåret."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
@@ -11573,6 +11579,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 ""
 "Rita riktningspilar med hjälp av tabelluppslagning istället för komplicerad "
@@ -11616,6 +11621,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 msgid "Allows to tune the track coloring for different average speeds."
-msgstr ""
-"Tillåter att spårets färg justeras efter olika genomsnittshastigheter."
+msgstr "Tillåter att spårets färg justeras efter olika genomsnittshastigheter."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
@@ -11638,6 +11642,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 "Använd antialiasing för att ge kartan ett jämnare utseende."
 
@@ -11710,5 +11713,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 "Aktivera inbyggda förval"
@@ -11728,6 +11731,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>:"
@@ -11852,6 +11854,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 ""
 
@@ -11864,9 +11866,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 ""
 
@@ -12167,6 +12169,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 ""
 
@@ -12177,5 +12179,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 ""
@@ -12185,18 +12187,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 ""
@@ -12205,5 +12207,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 ""
@@ -12212,5 +12214,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 ""
@@ -12219,9 +12221,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 "Sortera snabbvalsmenyn"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
 msgid "Tagging Presets"
 msgstr "Snabbval för taggning"
@@ -12330,6 +12332,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 ""
 
@@ -12351,6 +12353,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 ""
 
@@ -12428,6 +12430,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 ""
 
@@ -12443,6 +12444,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 ""
 
@@ -12536,6 +12536,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 ""
 
@@ -12668,4 +12668,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 "Ändra egenskaper"
@@ -12831,5 +12832,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
@@ -12849,5 +12850,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}''"
@@ -13014,6 +13015,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 ""
 
@@ -13130,10 +13130,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 ""
@@ -13141,69 +13141,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 "Stänger ändringssamling..."
 
-#: ../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}."
@@ -13381,4 +13381,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})"
@@ -13398,6 +13399,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 ""
 
@@ -13425,6 +13426,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 ""
 
@@ -13466,6 +13467,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 ""
 
@@ -13843,6 +13843,5 @@
 #, java-format
 msgid "Last plugin update more than {0} days ago."
-msgstr ""
-"Senaste uppdatering av insticksmoduler var för mer än {0} dagar sedan."
+msgstr "Senaste uppdatering av insticksmoduler var för mer än {0} dagar sedan."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:194
@@ -13901,6 +13900,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 ""
 
@@ -14113,6 +14112,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 ""
 
@@ -14179,5 +14177,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"
@@ -14260,6 +14258,6 @@
 msgid ""
 "<html>Uploading to the server <strong>failed</strong> because your "
-"current<br>dataset violates a precondition.<br>The error message "
-"is:<br>{0}</html>"
+"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
+"html>"
 msgstr ""
 "<html>Uppladdning till servern <strong>misslyckades</strong> eftersom "
@@ -14270,7 +14268,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 ""
 
@@ -14278,7 +14276,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 ""
 
@@ -14286,8 +14284,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 ""
 
@@ -14307,7 +14305,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 ""
 
@@ -14376,7 +14374,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 ""
 
@@ -14388,7 +14385,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 ""
 
@@ -14420,6 +14417,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 ""
 
@@ -14483,6 +14480,6 @@
 "\n"
 msgstr ""
-"Det gick inte att tilldela kortkommandot ''{0}'' till handlingen ''{1}'' "
-"({2})\n"
+"Det gick inte att tilldela kortkommandot ''{0}'' till handlingen "
+"''{1}'' ({2})\n"
 "eftersom detta kortkommando redan används för handlingen ''{3}'' ({4}).\n"
 "\n"
@@ -14928,6 +14925,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>"
@@ -14954,6 +14951,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"
@@ -14991,6 +14988,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"
@@ -15006,7 +15003,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"
@@ -15057,9 +15054,29 @@
 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 "Byggnader"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#, fuzzy
+msgid "Rotate crosshair"
+msgstr "Rotera åt höger"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#, fuzzy
+msgid "Advanced settings"
+msgstr "Avancerade inställningar"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#, fuzzy
+msgid "Building tag:"
+msgstr "Byggnad"
+
+#: ../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"
@@ -15068,35 +15085,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 "Offentlig byggnad"
+
+#: ../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 ""
 
@@ -15271,7 +15297,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--waterway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15281,5 +15307,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15289,5 +15315,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15303,5 +15329,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15311,5 +15337,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15317,8 +15343,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 "vatten"
@@ -15340,5 +15366,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15347,5 +15373,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15354,5 +15380,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15361,5 +15387,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15368,5 +15394,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15375,10 +15401,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 "adress"
@@ -15407,11 +15433,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 ""
 
@@ -15843,6 +15868,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 "Tomt lager"
@@ -16027,4 +16052,51 @@
 msgstr "Inget GPX-datalager kunde hittas."
 
+#: ../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 "Redigera zoo"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#, fuzzy
+msgid "Name:"
+msgstr "Namn"
+
+#: ../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 "Är du säker?"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
+#, fuzzy
+msgid "New tool..."
+msgstr "Ny roll"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
+#, fuzzy
+msgid "Install"
+msgstr "Industriområde"
+
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
 msgid "Position only"
@@ -16147,6 +16219,6 @@
 msgstr ""
 "Kan inte hämta biblioteket rxtxSerial. Om du behöver assistans med att "
-"installera detta, så läs globalsats hemsida på http://www.raphael-"
-"mack.de/josm-globalsat-gpx-import-plugin/"
+"installera detta, så läs globalsats hemsida på http://www.raphael-mack.de/"
+"josm-globalsat-gpx-import-plugin/"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
@@ -16294,5 +16366,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#. 
+#.
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16413,6 +16485,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 ""
 "Största antal delsträckor som tillåts i varje skapad sträcka. Förval 250."
@@ -16436,7 +16507,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 ""
 "Noggrannhet för Douglas-Peuckers linjeförenkling, mätt i grader.<br>Lägre "
@@ -16752,6 +16822,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 ""
 "Huvudet innehåller flera värden och kan inte mappas till en enda sträng"
@@ -16864,6 +16933,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 ""
 
@@ -16916,6 +16984,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 ""
 
@@ -17207,6 +17274,5 @@
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
-msgstr ""
-"En insticksmodul som låter JOSM kontrolleras från andra applikationer."
+msgstr "En insticksmodul som låter JOSM kontrolleras från andra applikationer."
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
@@ -17283,5 +17349,5 @@
 msgstr "Återgå"
 
-#: ../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}"
@@ -17332,4 +17398,43 @@
 msgid "Revert changeset #{0}"
 msgstr ""
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:78
+#, fuzzy
+msgid "Road Sign Plugin"
+msgstr "Hämtar insticksmoduler"
+
+#: ../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 "Kunde inte läsa källan till snabbval för taggning: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
+#, fuzzy, java-format
+msgid "Error parsing tagging preset from ''{0}'':\n"
+msgstr ""
+"Fel vid initiering av test {0}:\n"
+" {1}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:104
+#, fuzzy, java-format
+msgid "Sign {0}"
+msgstr "Urval: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:111
+#, fuzzy, java-format
+msgid "Additional sign {0}"
+msgstr "Lägg till relation {0}"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -17436,4 +17541,15 @@
 msgstr "Ange viktvärden"
 
+#: ../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 "Förenkla sträcka"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
+#, fuzzy
+msgid "Delete unnecessary nodes from an area."
+msgstr "Ta bort onödiga noder från en sträcka."
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
 msgid "Slippy Map"
@@ -18230,6 +18346,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 ""
 
@@ -18315,8 +18431,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 ""
 
@@ -18370,8 +18486,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 ""
 
@@ -18483,6 +18599,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 ""
 
@@ -18490,6 +18606,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 ""
 
@@ -19137,6 +19253,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
 msgid "Validate property values and tags using complex rules."
-msgstr ""
-"Validera egenskapsvärden och taggar med hjälp av komplicerade regler."
+msgstr "Validera egenskapsvärden och taggar med hjälp av komplicerade regler."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:657
@@ -19150,7 +19265,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 ""
 "De källor (URL eller filnamn) som används för att stavningskontrollera (läs "
@@ -19351,9 +19465,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 "yta (area)"
@@ -19457,11 +19571,146 @@
 msgstr "{0}, ..."
 
-#: ../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
+#, fuzzy, java-format
+msgid "{0} {1}% of GPS track"
+msgstr "{0} består av {1} spår"
+
+#: ../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 "Importera ljud"
+
+#: ../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 "Ta bort"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
+#, fuzzy
+msgid "removes current video from layer"
+msgstr "Ta bort foto från lagret"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
+#, fuzzy
+msgid "play/pause"
+msgstr "Spela/pausa"
+
+#: ../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 "bakgrund"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
+#, fuzzy
+msgid "jumps n sec back"
+msgstr "Hoppa tillbaka."
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "forward"
+msgstr "Framåt"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "jumps n sec forward"
+msgstr "Hoppa framåt"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
+#, fuzzy
+msgid "faster"
+msgstr "Snabbare"
+
+#: ../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 "Långsammare"
+
+#: ../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 "Centrera kontinuerligt LiveGPS-lagret runt nuvarande position."
+
+#. 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
+#, fuzzy
+msgid "Jump length"
+msgstr "Gå direkt dit"
+
+#: ../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
+#, fuzzy
+msgid "Loop length"
+msgstr "Längd: "
+
+#: ../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 "lager"
+
+#: ../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 ""
 
@@ -19674,28 +19923,28 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
 msgid "Automatic downloading"
 msgstr "Automatisk hämtning"
 
-#: ../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 "WMS-lager ({0}), hämtas automatiskt i zoomläge {1}"
 
-#: ../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 "WMS-lager ({0}), hämtas i zoomläge {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
 #, java-format
 msgid ""
@@ -19706,114 +19955,114 @@
 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 "Hämta de rutor som syns"
 
-#: ../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 "Den begärda ytan är för stor. Zooma in lite eller ändra upplösning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329
 msgid "Change resolution"
 msgstr "Ändra upplösning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341
 msgid "Reload erroneous tiles"
 msgstr "Läs om felaktiga rutor"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365
 msgid "Alpha channel"
 msgstr "Alfakanal"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385
 msgid "Save WMS layer to file"
 msgstr "Spara WMS-lagret till en fil"
 
-#: ../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 "Hämta WMS-lager från en fil"
 
-#: ../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 "WMS-filversion som ej stöds; funnen {0}, förväntad {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
 msgid "File Format Error"
 msgstr "Fel filformat"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449
 msgid "Error loading file"
 msgstr "Fel vid läsning av fil"
 
-#: ../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 "Öppna ett tomt WMS-lager för att läsa in data från en fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
 msgid "WMS Plugin Preferences"
 msgstr "Inställningar för WMS-insticksmodulen"
 
-#: ../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 ""
 "Justera listan över WMS-servrar som visas i menyn för WMS-insticksmodulen"
 
-#: ../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 "Menynamn"
 
-#: ../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 "URL för WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "Menu Name (Default)"
 msgstr "Menynamn (Förval)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "WMS URL (Default)"
 msgstr "WMS-url (Förval)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:86
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
 msgid "Enter a menu name and WMS URL"
 msgstr "Ange ett menynamn och en URL för 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 ""
@@ -19829,4 +20078,8 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
 msgid "% of north:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186
+msgid "Simultaneous connections"
 msgstr ""
 
@@ -19839,7 +20092,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
@@ -19889,8 +20142,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 "skog"
@@ -19907,7 +20160,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--boundary tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -19917,5 +20170,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -19958,5 +20211,5 @@
 #. color boundary
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -19966,5 +20219,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -19974,5 +20227,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -19982,15 +20235,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 "gräns"
@@ -20006,5 +20259,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -20013,7 +20266,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--route tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -20023,5 +20276,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -20031,5 +20284,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -20039,5 +20292,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -20047,5 +20300,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -20055,5 +20308,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -20063,5 +20316,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -20071,12 +20324,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 "rutt"
@@ -20353,21 +20606,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 "
@@ -20377,10 +20629,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."
@@ -20388,5 +20640,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 "
@@ -20396,15 +20648,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 "Konvertera enkelt en yta till en multipolygon."
 
 #. Plugin multipoly
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:44
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -20415,5 +20667,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 "
@@ -20423,15 +20675,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"
@@ -20439,5 +20691,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."
@@ -20445,5 +20697,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 "
@@ -20452,5 +20704,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 "
@@ -20459,10 +20711,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."
@@ -20470,15 +20722,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 "
@@ -20489,10 +20742,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 "
@@ -20501,15 +20761,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 "
@@ -20519,10 +20779,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). "
@@ -20531,5 +20791,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) "
@@ -20538,5 +20798,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:89
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20545,10 +20805,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 "
@@ -20557,5 +20817,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 "
@@ -20565,5 +20825,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:97
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20572,15 +20832,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 "
@@ -20589,5 +20849,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:105
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21477,10 +21737,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 "rondell"
@@ -21617,8 +21877,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"/>
@@ -21828,5 +22088,5 @@
 #. color motorroad
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21836,5 +22096,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21853,5 +22113,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21861,5 +22121,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21878,5 +22138,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -21886,5 +22146,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -21903,5 +22163,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -21911,5 +22171,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -21924,5 +22184,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -21940,8 +22200,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 "bostadsgata"
@@ -21956,5 +22216,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -21963,5 +22223,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--public_transport tags -->
 #. <rule>
@@ -21971,10 +22231,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 "tillfartsväg"
@@ -21989,5 +22249,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -21996,5 +22256,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -22004,10 +22264,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 "under byggnad"
@@ -23013,9 +23273,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 "kärr"
@@ -23345,5 +23605,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -23353,5 +23613,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -23361,5 +23621,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -23369,5 +23629,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -23377,5 +23637,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -23385,5 +23645,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -23393,5 +23653,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -23402,5 +23662,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -23408,9 +23668,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 "räls"
@@ -24820,5 +25080,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24828,5 +25088,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24836,5 +25096,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24844,5 +25104,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -25206,7 +25466,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--sport tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -25216,5 +25476,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -25224,5 +25484,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -25232,5 +25492,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -25240,5 +25500,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -25248,5 +25508,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -25256,5 +25516,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -25264,5 +25524,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -25272,5 +25532,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -25280,5 +25540,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -25288,5 +25548,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -25296,5 +25556,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -25304,5 +25564,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -25312,5 +25572,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -25320,5 +25580,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -25328,5 +25588,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -25336,5 +25596,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -25344,5 +25604,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -25352,5 +25612,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -25360,5 +25620,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -25368,5 +25628,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -25376,5 +25636,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -25384,5 +25644,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -25392,5 +25652,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -25400,5 +25660,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -25408,5 +25668,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -25416,5 +25676,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -25424,5 +25684,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -25432,5 +25692,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -25440,5 +25700,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -25448,5 +25708,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -25456,5 +25716,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -25464,5 +25724,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -25472,5 +25732,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -25480,5 +25740,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -25488,5 +25748,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -25496,5 +25756,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -25504,5 +25764,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -25512,5 +25772,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -25520,5 +25780,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -25528,5 +25788,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -25536,5 +25796,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -25544,5 +25804,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -25552,5 +25812,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -25560,5 +25820,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -25568,5 +25828,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -25576,33 +25836,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 "sport"
@@ -27280,7 +27540,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--landuse tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -27290,5 +27550,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -27298,5 +27558,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -27306,5 +27566,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -27314,5 +27574,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -27322,5 +27582,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -27330,5 +27590,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -27338,5 +27598,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -27346,12 +27606,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 ""
@@ -28767,5 +29027,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -28781,5 +29041,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28789,18 +29049,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 -->
@@ -28809,7 +29086,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- cycleway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28819,5 +29096,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28827,5 +29104,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28835,5 +29112,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28843,12 +29120,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 "cykel"
@@ -28875,5 +29153,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -28889,5 +29167,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -28897,5 +29175,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28904,13 +29182,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"/>
@@ -28921,11 +29207,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 "fot"
@@ -28944,8 +29231,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 "tunnelbana"
@@ -29057,9 +29344,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
@@ -29067,5 +29354,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,
@@ -29075,8 +29362,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
@@ -29090,5 +29377,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#. 
+#.
 #: build/trans_style.java:72
 msgid "standard"
@@ -29096,5 +29383,5 @@
 
 #. mappaint style named "standard"
-#. 
+#.
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -29143,6 +29430,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>
@@ -29222,5 +29509,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -29230,16 +29517,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 "förlegad"
@@ -29250,5 +29537,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -29257,5 +29544,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -29264,5 +29551,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -29278,5 +29565,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -29290,5 +29577,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -29297,5 +29584,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -29304,5 +29591,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -29311,5 +29598,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -29318,5 +29605,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -29325,5 +29612,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -29332,5 +29619,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxweight"/>
@@ -29339,5 +29626,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxheight"/>
@@ -29346,5 +29633,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -29353,5 +29640,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxlength"/>
@@ -29360,5 +29647,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -29367,5 +29654,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="minspeed"/>
@@ -29374,5 +29661,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxstay"/>
@@ -29381,5 +29668,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="toll"/>
@@ -29388,5 +29675,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="barrier"/>
@@ -29563,7 +29850,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- highway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -29577,5 +29864,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -29585,7 +29872,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- tracktype tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -29595,5 +29882,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -29603,5 +29890,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -29611,5 +29898,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -29619,10 +29906,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 "landsvägsspår"
@@ -29633,5 +29920,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -29640,5 +29927,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -29648,5 +29935,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -29655,5 +29942,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -29662,5 +29949,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -29669,5 +29956,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -29676,5 +29963,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -29683,5 +29970,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -29690,5 +29977,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -29697,5 +29984,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -29704,5 +29991,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -29711,8 +29998,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 ""
@@ -29723,8 +30010,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 ""
@@ -29735,5 +30022,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -29742,8 +30029,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 "vändplats"
@@ -29754,9 +30041,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 ""
@@ -29767,9 +30054,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 "flodbank"
@@ -29780,8 +30067,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 "bäck"
@@ -29792,8 +30079,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 "hamn"
@@ -29804,5 +30091,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29811,5 +30098,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29818,5 +30105,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29826,5 +30113,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29833,5 +30120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29840,5 +30127,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29847,5 +30134,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29855,5 +30142,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29864,5 +30151,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -29872,7 +30159,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--man_made tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -29882,5 +30169,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -29890,5 +30177,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -29898,5 +30185,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -29907,5 +30194,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -29914,5 +30201,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -29922,5 +30209,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -29930,5 +30217,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -29938,5 +30225,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -29946,5 +30233,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -29954,5 +30241,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -29962,5 +30249,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -29970,5 +30257,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -29978,5 +30265,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -29986,18 +30273,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 "byggnadsverk"
@@ -30007,9 +30294,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 ""
@@ -30020,7 +30307,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- railway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -30030,5 +30317,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -30037,5 +30324,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -30045,5 +30332,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -30052,5 +30339,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -30060,5 +30347,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -30068,10 +30355,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 "järnvägspunkt"
@@ -30082,5 +30369,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -30091,13 +30378,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 ""
@@ -30108,5 +30395,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -30116,5 +30403,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30127,5 +30414,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30133,7 +30420,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 ""
@@ -30144,5 +30431,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -30151,5 +30438,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -30158,5 +30445,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -30165,7 +30452,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aeroway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -30176,9 +30463,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 ""
@@ -30189,8 +30476,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 "terminal"
@@ -30201,5 +30488,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -30209,8 +30496,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 ""
@@ -30221,8 +30508,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 ""
@@ -30233,5 +30520,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -30240,5 +30527,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -30247,7 +30534,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aerialway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -30257,5 +30544,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -30265,5 +30552,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -30273,5 +30560,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -30281,5 +30568,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -30289,10 +30576,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 "linbana"
@@ -30303,11 +30590,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 ""
@@ -30318,9 +30605,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 ""
@@ -30331,9 +30618,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 ""
@@ -30344,9 +30631,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 ""
@@ -30357,9 +30644,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 ""
@@ -30370,9 +30657,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 ""
@@ -30383,7 +30670,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--power tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -30393,5 +30680,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -30400,5 +30687,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -30408,5 +30695,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -30416,5 +30703,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -30424,5 +30711,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -30432,5 +30719,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -30440,5 +30727,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -30448,5 +30735,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -30456,5 +30743,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -30464,5 +30751,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -30472,5 +30759,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -30480,5 +30767,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -30488,15 +30775,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 "kraft"
@@ -30506,9 +30793,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 "pir"
@@ -30519,8 +30806,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 "rörledning"
@@ -30530,7 +30817,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--leisure tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -30540,5 +30827,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -30548,5 +30835,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -30556,5 +30843,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -30564,5 +30851,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -30572,5 +30859,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -30580,5 +30867,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -30588,5 +30875,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -30596,5 +30883,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -30604,5 +30891,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -30612,5 +30899,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -30620,5 +30907,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -30628,5 +30915,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -30636,5 +30923,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -30644,5 +30931,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -30652,5 +30939,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -30660,17 +30947,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 "fritid"
@@ -30680,9 +30967,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 "marina"
@@ -30692,7 +30979,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--amenity tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -30702,5 +30989,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -30710,5 +30997,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -30718,5 +31005,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -30726,5 +31013,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -30734,5 +31021,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -30742,5 +31029,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -30750,5 +31037,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -30758,5 +31045,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -30766,5 +31053,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -30774,14 +31061,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 "inrättning"
@@ -30791,5 +31078,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30799,5 +31086,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30807,5 +31094,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30815,5 +31102,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30823,5 +31110,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30831,5 +31118,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30839,5 +31126,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30847,5 +31134,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30855,5 +31142,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30863,5 +31150,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -30871,5 +31158,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -30879,14 +31166,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 "trafikinrättning"
@@ -30896,5 +31183,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -30903,5 +31190,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -30911,5 +31198,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -30918,5 +31205,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -30926,5 +31213,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -30934,5 +31221,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -30942,5 +31229,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -30949,5 +31236,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -30957,5 +31244,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -30965,5 +31252,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -30973,5 +31260,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -30981,5 +31268,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -30988,5 +31275,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -30995,5 +31282,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -31002,5 +31289,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -31009,5 +31296,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -31016,5 +31303,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -31023,5 +31310,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -31030,5 +31317,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -31037,5 +31324,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -31044,5 +31331,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -31051,5 +31338,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -31058,5 +31345,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -31065,5 +31352,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -31072,5 +31359,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -31080,5 +31367,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -31088,5 +31375,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -31096,5 +31383,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -31104,5 +31391,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -31112,5 +31399,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -31120,5 +31407,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -31128,5 +31415,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -31136,5 +31423,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -31144,5 +31431,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -31153,5 +31440,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -31161,5 +31448,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -31169,5 +31456,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -31177,5 +31464,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -31185,5 +31472,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -31193,5 +31480,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -31201,5 +31488,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -31209,5 +31496,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -31217,5 +31504,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -31225,5 +31512,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -31233,5 +31520,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -31241,5 +31528,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -31249,5 +31536,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -31257,5 +31544,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -31265,5 +31552,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -31273,5 +31560,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"/>
@@ -31281,5 +31576,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -31289,5 +31584,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -31297,5 +31592,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -31305,5 +31600,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -31312,27 +31607,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 ""
@@ -31342,5 +31638,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -31350,5 +31646,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -31358,12 +31654,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 ""
@@ -31373,5 +31669,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -31381,5 +31677,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -31389,5 +31685,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -31397,5 +31693,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -31405,5 +31701,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -31413,5 +31709,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -31421,11 +31717,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 "hälsa"
@@ -31435,7 +31731,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--shop tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -31445,5 +31741,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -31453,5 +31749,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -31461,5 +31757,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -31469,5 +31765,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -31477,5 +31773,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -31485,5 +31781,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -31493,5 +31789,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -31501,5 +31797,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -31509,5 +31805,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -31517,5 +31813,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -31525,5 +31821,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -31533,5 +31829,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -31541,5 +31837,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -31549,5 +31845,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -31557,5 +31853,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -31565,5 +31861,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -31573,5 +31869,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -31581,5 +31877,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -31589,5 +31885,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -31597,5 +31893,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -31605,5 +31901,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -31613,5 +31909,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -31621,5 +31917,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -31629,5 +31925,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -31637,5 +31933,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -31645,5 +31941,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -31653,5 +31949,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -31661,5 +31957,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -31669,5 +31965,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -31677,5 +31973,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -31685,5 +31981,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -31693,5 +31989,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -31701,5 +31997,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -31709,5 +32005,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -31717,5 +32013,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -31725,5 +32021,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -31733,5 +32029,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -31741,5 +32037,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -31749,5 +32045,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -31757,5 +32053,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -31765,5 +32061,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -31773,31 +32069,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 "affär"
@@ -31807,7 +32103,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--tourism tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31817,5 +32113,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31825,5 +32121,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31833,5 +32129,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31841,5 +32137,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31849,5 +32145,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31857,5 +32153,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31865,12 +32161,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 "hotell"
@@ -31880,5 +32176,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -31888,5 +32184,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -31896,5 +32192,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -31904,5 +32200,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -31912,5 +32208,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -31920,5 +32216,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -31929,5 +32225,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -31937,5 +32233,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- information tags -->
 #. <rule>
@@ -31945,5 +32241,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -31953,5 +32249,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -31960,5 +32256,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -31967,13 +32263,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 "turism"
@@ -31983,7 +32279,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--historic tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -31993,5 +32289,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -32001,5 +32297,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -32009,5 +32305,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -32017,5 +32313,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -32025,5 +32321,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -32033,5 +32329,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -32041,5 +32337,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -32049,5 +32345,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -32057,13 +32353,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 "historisk"
@@ -32073,8 +32369,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 "stenbrott"
@@ -32085,8 +32381,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 ""
@@ -32097,5 +32393,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -32105,8 +32401,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 "hamnbassäng"
@@ -32117,8 +32413,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 "gårdsplan"
@@ -32129,6 +32425,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
-#. 
+#.
+#.
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -32138,8 +32434,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 "detaljhandel"
@@ -32150,8 +32446,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 "industri"
@@ -32162,8 +32458,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 ""
@@ -32174,8 +32470,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 ""
@@ -32186,8 +32482,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 ""
@@ -32198,5 +32494,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -32206,7 +32502,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--military tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -32216,5 +32512,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -32224,5 +32520,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -32232,5 +32528,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -32240,11 +32536,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 "militär"
@@ -32255,8 +32551,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 "begravningsplats"
@@ -32266,8 +32562,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 "topp"
@@ -32278,9 +32574,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 "glaciär"
@@ -32290,9 +32586,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 "vulkan"
@@ -32302,5 +32598,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -32311,5 +32607,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -32319,5 +32615,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -32327,5 +32623,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -32335,5 +32631,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -32343,12 +32639,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 "naturfenomen"
@@ -32358,9 +32654,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 "buskage"
@@ -32370,9 +32666,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 "hed"
@@ -32382,9 +32678,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 ""
@@ -32394,9 +32690,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 "lera"
@@ -32406,9 +32702,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 "strand"
@@ -32419,5 +32715,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?
@@ -32443,5 +32739,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -32452,11 +32748,11 @@
 #. </rule>
 #. -->
-#. 
+#.
 #. <!--name tags -->
-#. 
+#.
 #. <!--preferences tags -->
-#. 
+#.
 #. <!--place tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -32466,5 +32762,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -32474,5 +32770,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -32482,5 +32778,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -32490,5 +32786,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -32498,5 +32794,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -32506,5 +32802,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -32514,5 +32810,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -32522,5 +32818,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -32530,5 +32826,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -32538,5 +32834,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -32546,5 +32842,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -32554,15 +32850,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 "plats"
@@ -32572,9 +32868,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 ""
@@ -32665,5 +32961,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#. 
+#.
 #. Data type can be:
 #. node        - a node point
@@ -32671,28 +32967,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
@@ -32807,5 +33103,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#. 
+#.
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32818,5 +33114,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>
@@ -32841,6 +33137,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#. 
-#. 
+#.
+#.
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32849,6 +33145,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#. 
-#. 
+#.
+#.
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32863,6 +33159,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
@@ -32876,6 +33172,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
@@ -32895,6 +33191,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#. 
-#. 
+#.
+#.
 #. only for Japan
 #: build/trans_wms.java:39
@@ -32918,6 +33214,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
@@ -32974,5 +33270,4 @@
 #~ msgstr "Det går bara att redigera hjälpsidor från onlinehjälpen för JOSM"
 
-#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Fel vid inläsning av sida{0}"
@@ -32982,8 +33277,9 @@
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still want "
-#~ "to merge them?"
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
 #~ msgstr ""
-#~ "De valda noderna har olika relationsmedlemsskap. Vill du ändå slå ihop dem?"
+#~ "De valda noderna har olika relationsmedlemsskap. Vill du ändå slå ihop "
+#~ "dem?"
 
 #~ msgid "Merge nodes with different memberships?"
@@ -32998,11 +33294,11 @@
 
 #~ msgid ""
-#~ "You are about to delete nodes outside of the area you have "
-#~ "downloaded.<br>This can cause problems because other objects (that you don't "
-#~ "see) might use them.<br>Do you really want to delete?"
+#~ "You are about to delete nodes outside of the area you have downloaded."
+#~ "<br>This can cause problems because other objects (that you don't see) "
+#~ "might use them.<br>Do you really want to delete?"
 #~ msgstr ""
-#~ "Du håller på att ta bort noder utanför det område som du har hämtat hem.<br> "
-#~ "Detta kan leda till problem eftersom andra objekt (som du inte ser) kanske "
-#~ "använder dem.<br> Vill du verkligen ta bort dem?"
+#~ "Du håller på att ta bort noder utanför det område som du har hämtat hem."
+#~ "<br> Detta kan leda till problem eftersom andra objekt (som du inte ser) "
+#~ "kanske använder dem.<br> Vill du verkligen ta bort dem?"
 
 #~ msgid "Conflicting relation"
@@ -33024,5 +33320,4 @@
 #~ msgstr "deras version:"
 
-#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -33045,5 +33340,4 @@
 #~ msgstr "Ingen data importerad."
 
-#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "Kontakta {0}..."
@@ -33082,5 +33376,4 @@
 #~ msgstr "x från"
 
-#, java-format
 #~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
 #~ msgstr "Kan inte lästa tidpunkt \"{0}\" från punkt {1} x {2}"
@@ -33089,9 +33382,7 @@
 #~ msgstr "Inga bilder med läsbara tidsangivelser hittades."
 
-#, java-format
 #~ msgid "No time for point {0} x {1}"
 #~ msgstr "Tid saknas för punkt {0} x {1}"
 
-#, java-format
 #~ msgid "Images for {0}"
 #~ msgstr "Bilder för {0}"
@@ -33100,13 +33391,10 @@
 #~ msgstr "Läs in GPX..."
 
-#, java-format
 #~ msgid "GPS start: {0}"
 #~ msgstr "GPS startpunkt: {0}"
 
-#, java-format
 #~ msgid "current delta: {0}s"
 #~ msgstr "nuvarande delta: {0}s"
 
-#, java-format
 #~ msgid "GPS end: {0}"
 #~ msgstr "GPS slutpunkt: {0}"
@@ -33118,9 +33406,7 @@
 #~ msgstr "Synka klocka"
 
-#, java-format
 #~ msgid "The date in file \"{0}\" could not be parsed."
 #~ msgstr "Datum i fil \"{0}\" kunde inte tolkas."
 
-#, java-format
 #~ msgid "There is no EXIF time within the file \"{0}\"."
 #~ msgstr "Det finns inte någon EXIF-tid i filen\"{0}\"."
@@ -33138,5 +33424,4 @@
 #~ msgstr "Filen hittades inte"
 
-#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} inom spåret."
@@ -33146,5 +33431,6 @@
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you load\n"
+#~ "Parameters are read in the order they are specified, so make sure you "
+#~ "load\n"
 #~ "some data before --selection"
 #~ msgstr ""
@@ -33153,9 +33439,9 @@
 
 #~ 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 ""
-#~ "Det gick inte att aktivera de uppdaterade insticksmodulerna. Kontrollera om "
-#~ "JOSM har behörighet att skriva över de existerande."
+#~ "Det gick inte att aktivera de uppdaterade insticksmodulerna. Kontrollera "
+#~ "om JOSM har behörighet att skriva över de existerande."
 
 #~ msgid "Download missing plugins"
@@ -33173,5 +33459,4 @@
 #~ msgstr "Fel vid tolkning."
 
-#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Insticksmodulen kunde ej hittas: {0}."
@@ -33179,7 +33464,7 @@
 #~ msgid "Hint: Some changes came from uploading new data to the server."
 #~ msgstr ""
-#~ "Tips: Några av ändringarna härrör från inskickning av nya data till servern."
-
-#, java-format
+#~ "Tips: Några av ändringarna härrör från inskickning av nya data till "
+#~ "servern."
+
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -33192,5 +33477,4 @@
 #~ " {0}"
 
-#, java-format
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Kunde inte hämta insticksmodul: {0} från {1}"
@@ -33272,7 +33556,4 @@
 #~ msgstr "fel vid begäran om uppdatering"
 
-#~ msgid "Are you sure?"
-#~ msgstr "Är du säker?"
-
 #~ msgid "Edit Station"
 #~ msgstr "Redigera station"
@@ -33315,6 +33596,6 @@
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version selected "
-#~ "in the history list."
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
 #~ msgstr ""
 #~ "Återställ alla de nu valda objekten till den version som valts i "
@@ -33340,8 +33621,9 @@
 
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want to "
-#~ "combine them?"
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
 #~ msgstr ""
-#~ "De valda sträckorna har olika roller i relationen. Vill du ändå slå ihop dem?"
+#~ "De valda sträckorna har olika roller i relationen. Vill du ändå slå ihop "
+#~ "dem?"
 
 #~ msgid "Images with no exif position"
@@ -33354,5 +33636,4 @@
 #~ msgstr "Förbereder..."
 
-#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "Insticksmodulen kräver en uppdatering av JOSM: {0}."
@@ -33368,8 +33649,7 @@
 #~ "setting the config option 'pluginmanager.warntime'.)"
 #~ msgstr ""
-#~ "(Du kan ändra det tidsintervall (i dagar) med vilket denna varning visas<br> "
-#~ "med hjälp av inställningen 'pluginmanager.warntime'.)"
-
-#, java-format
+#~ "(Du kan ändra det tidsintervall (i dagar) med vilket denna varning "
+#~ "visas<br> med hjälp av inställningen 'pluginmanager.warntime'.)"
+
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Lämna in en rapport på {0}"
@@ -33380,6 +33660,6 @@
 #~ msgid "Include your steps to get to the error (as detailed as possible)!"
 #~ msgstr ""
-#~ "Berätta de steg du genomförde för att nå fram till felet (så detaljerat som "
-#~ "möjligt)!"
+#~ "Berätta de steg du genomförde för att nå fram till felet (så detaljerat "
+#~ "som möjligt)!"
 
 #~ msgid "Edit Properties"
@@ -33423,5 +33703,4 @@
 #~ msgstr "Id för Metacartas korrigerade kartbild"
 
-#, java-format
 #~ msgid "rectifier id={0}"
 #~ msgstr "korrigeringsid={0}"
@@ -33466,14 +33745,13 @@
 #~ msgstr "cykelkarta"
 
-#, java-format
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "Använd snabbvalet ''{0}'' i gruppen ''{1}''"
 
 #~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before reporting "
-#~ "a bug."
+#~ "Try updating to the newest version of JOSM and all plugins before "
+#~ "reporting a bug."
 #~ msgstr ""
-#~ "Innan du rapporterar in ett fel, försök först att uppdatera till den nyaste "
-#~ "versionen av JOSM och alla insticksmoduler."
+#~ "Innan du rapporterar in ett fel, försök först att uppdatera till den "
+#~ "nyaste versionen av JOSM och alla insticksmoduler."
 
 #~ msgid "NullPointerException, possibly some missing tags."
@@ -33494,9 +33772,7 @@
 #~ "information."
 
-#, java-format
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "Kunde inte läsa från URL:en: \"{0}\""
 
-#, java-format
 #~ msgid "Parsing error in URL: \"{0}\""
 #~ msgstr "Inläsningsfel på URL:en: \"{0}\""
@@ -33516,6 +33792,6 @@
 
 #~ msgid ""
-#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
-#~ "these will then show up in the WMS menu.\n"
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
 #~ "\n"
 #~ "You can also do this manually in the Advanced Preferences, using the "
@@ -33532,6 +33808,6 @@
 #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
 #~ "only need to input the relevant 'id'.\n"
-#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in "
-#~ "this example,replacing 73 with your image id: \n"
+#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
+#~ "in this example,replacing 73 with your image id: \n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -33543,6 +33819,6 @@
 #~ "inställningsfliken för WMSplugin - dessa kommer att synas i WMS-menyn.\n"
 #~ "\n"
-#~ "Du kan också göra dessa ändringar manuellt under avancerade inställningar, "
-#~ "enligt följande mall:\n"
+#~ "Du kan också göra dessa ändringar manuellt under avancerade "
+#~ "inställningar, enligt följande mall:\n"
 #~ "wmsplugin.url.1.name=Landsat\n"
 #~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
@@ -33554,13 +33830,14 @@
 #~ "format=image/jpeg \n"
 #~ "\n"
-#~ "Vad gäller Metacartas Kartkorrigerare http://labs.metacarta.com/rectifier/ , "
-#~ "så behöver du enbart ange relevant 'id'.\n"
-#~ "För att lägga till en menypost för en korrigerad karta från Metacarta, skapa "
-#~ "manuellt en url som i följande exempel och ersätt 73 med id för din bild: \n"
+#~ "Vad gäller Metacartas Kartkorrigerare http://labs.metacarta.com/"
+#~ "rectifier/ , så behöver du enbart ange relevant 'id'.\n"
+#~ "För att lägga till en menypost för en korrigerad karta från Metacarta, "
+#~ "skapa manuellt en url som i följande exempel och ersätt 73 med id för din "
+#~ "bild: \n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
 #~ " \n"
-#~ "Observera: Se till att bilden får användas enligt copyright-regler, om du är "
-#~ "tveksam så använd inte den."
+#~ "Observera: Se till att bilden får användas enligt copyright-regler, om du "
+#~ "är tveksam så använd inte den."
 
 #~ msgid "Portcullis"
@@ -33570,8 +33847,9 @@
 #~ msgstr "Lägg till antingen site-josm.xml eller wikisidor."
 
-#, java-format
-#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
+#~ msgid ""
+#~ "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them all?"
+#~ "The selection contains {0} ways. Are you sure you want to simplify them "
+#~ "all?"
 #~ msgstr[0] ""
 #~ "Urvalet innehåller {0} sträcka. Är du säker på att du vill förenkla den?"
@@ -33584,10 +33862,10 @@
 #~ "some time."
 #~ msgstr ""
-#~ "Servern svarade med internt fel. Försök med ett mindre område eller försök "
-#~ "igen efter en stund."
-
-#, java-format
+#~ "Servern svarade med internt fel. Försök med ett mindre område eller "
+#~ "försök igen efter en stund."
+
 #~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded automatically."
+#~ "The plugin {0} seems to be broken or could not be downloaded "
+#~ "automatically."
 #~ msgstr ""
 #~ "Insticksmodulen {0} verkar korrupt eller kunde inte hämtas automatiskt."
@@ -33596,5 +33874,4 @@
 #~ msgstr "Skicka in till OSM..."
 
-#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -33608,49 +33885,37 @@
 #~ "{0}"
 
-#, java-format
 #~ msgid "multipolygon way ''{0}'' is not closed."
 #~ msgstr "Multipolygonsträckan ''{0}'' är inte sluten."
 
-#, java-format
 #~ msgid "No useful role ''{0}'' for Way ''{1}''."
 #~ msgstr "Ingen användbar roll ''{0}'' för sträckan ''{1}''."
 
-#, java-format
 #~ msgid "Way ''{0}'' with less than two points."
 #~ msgstr "Sträcka \"{0} med mindre än två punkter."
 
-#, java-format
 #~ msgid "Non-Way ''{0}'' in multipolygon."
 #~ msgstr "Icke-sträcka ''{0}'' i multipolygon."
 
-#, java-format
 #~ msgid "Style for inner way ''{0}'' equals multipolygon."
 #~ msgstr "Stil för inre väg ''{0}'' är samma som multipolygonen."
 
-#, java-format
 #~ msgid "Style for outer way ''{0}'' mismatches."
 #~ msgstr "Stil för yttre väg ''{0}'' passar inte."
 
-#, java-format
 #~ msgid "Error: {0}"
 #~ msgstr "Fel: {0}"
 
-#, java-format
 #~ msgid "Warning: {0}"
 #~ msgstr "Varning: {0}"
 
-#, java-format
 #~ msgid "No outer way for multipolygon ''{0}''."
 #~ msgstr "Multipolygonen ''{0}'' saknar yttre sträcka."
 
-#, java-format
 #~ msgid "Intersection between ways ''{0}'' and ''{1}''."
 #~ msgstr "Intersektionen mellan sträckorna ''{0}'' och ''{1}''."
 
-#, java-format
 #~ msgid "Inner way ''{0}'' is outside."
 #~ msgstr "Den inre sträckan ''{0}'' befinner sig utanför."
 
-#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Kan inte öppna inställningsmappen: {0}"
@@ -33677,13 +33942,10 @@
 #~ msgstr "Ersätter urvalet med användarens data"
 
-#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "Upphovsmän: {0}"
 
-#, java-format
 #~ msgid "Layers: {0}"
 #~ msgstr "Lager: {0}"
 
-#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Kommandolista: {0}"
@@ -33718,10 +33980,11 @@
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
 #~ msgstr ""
-#~ "Du kan använda musen eller Ctrl+Piltangenter/./ för att zooma och panorera."
-
-#, java-format
+#~ "Du kan använda musen eller Ctrl+Piltangenter/./ för att zooma och "
+#~ "panorera."
+
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr ""
-#~ "Hoppar över en sträcka eftersom den innehåller en nod som inte finns: {0}\n"
+#~ "Hoppar över en sträcka eftersom den innehåller en nod som inte finns: "
+#~ "{0}\n"
 
 #~ msgid "Please select one or more closed ways of at least four nodes."
@@ -33740,9 +34003,7 @@
 #~ msgstr "Det finns inte någon \"från\"-sträcka."
 
-#, java-format
 #~ msgid "Unknown role ''{0}''."
 #~ msgstr "Okänd roll ''{0}''."
 
-#, java-format
 #~ msgid "Unknown member type for ''{0}''."
 #~ msgstr "Okänd medlemstyp för ''{0}''."
@@ -33766,5 +34027,4 @@
 #~ msgstr "Om vald så är dina spår öppna för allmänheten på openstreetmap.org"
 
-#, java-format
 #~ msgid "Style for restriction {0} not found."
 #~ msgstr "Stil för restriktion {0} kunde inte hittas."
@@ -33784,9 +34044,9 @@
 
 #~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this as "
-#~ "a bug."
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
 #~ msgstr ""
-#~ "Internt fel: kan inte kontrollera förhållanden för inget lager. Rapportera "
-#~ "in detta som ett fel."
+#~ "Internt fel: kan inte kontrollera förhållanden för inget lager. "
+#~ "Rapportera in detta som ett fel."
 
 #~ msgid "Login"
@@ -33810,6 +34070,6 @@
 #~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
 #~ msgstr ""
-#~ "DETTA ÄR EXPERIMENTKOD. Spara och kontrollera ditt arbete innan du skickar "
-#~ "in det."
+#~ "DETTA ÄR EXPERIMENTKOD. Spara och kontrollera ditt arbete innan du "
+#~ "skickar in det."
 
 #~ msgid "sports"
@@ -33819,5 +34079,4 @@
 #~ msgstr "Flytta nedåt"
 
-#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Relationsredigerare:{0}"
@@ -33839,15 +34098,14 @@
 #~ "skickats in har en historik."
 
-#, java-format
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
 #~ "continue?"
 #~ msgstr ""
-#~ "Denna handling kräver {0} enskilda hämtningsförfrågningar. Vill du fortsätta?"
+#~ "Denna handling kräver {0} enskilda hämtningsförfrågningar. Vill du "
+#~ "fortsätta?"
 
 #~ msgid "Update Data"
 #~ msgstr "Uppdatera data"
 
-#, java-format
 #~ msgid "Change the projection to {0} first."
 #~ msgstr "Ändra projektionen till {0} först."
@@ -33884,8 +34142,9 @@
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data layer?"
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
 #~ msgstr ""
-#~ "Ingen data som behövde uppdateras hittades. Har du redan öppnat eller laddat "
-#~ "ner ett datalager?"
+#~ "Ingen data som behövde uppdateras hittades. Har du redan öppnat eller "
+#~ "laddat ner ett datalager?"
 
 #~ msgid "Errors during Download"
@@ -33905,9 +34164,7 @@
 #~ "Korrelerar bilder med GPS-spår eller importerar EXIF-geotaggade bilder."
 
-#, java-format
 #~ msgid "Found {0} matches of {1} in GPX track {2}"
 #~ msgstr "Hittade {0} träffar för {1} i GPX-spår {2}"
 
-#, java-format
 #~ msgid "Offset between track and photos: {0}m {1}s"
 #~ msgstr "Förskjutning mellan spår och foton: {0}m {1}s"
@@ -33922,5 +34179,4 @@
 #~ msgstr "Slå ihop sträckor med olika roller?"
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -33945,5 +34201,4 @@
 #~ msgstr "Ångrar radering av väg..."
 
-#, java-format
 #~ msgid "Checking whether node {0} is gone ..."
 #~ msgstr "Kontrollerar huruvida nod {0} är borta..."
@@ -33952,30 +34207,30 @@
 #~ msgstr "Återskapar relation..."
 
-#, java-format
 #~ msgid "Checking whether primitive {0} is gone ..."
 #~ msgstr "Kontrollerar huruvida primitiv {0} är borta..."
 
-#, java-format
 #~ msgid ""
-#~ "<html>The OSM primitive with id <strong>{0}</strong> has been deleted<br>on "
-#~ "the server by another mapper.<br><br>Click <strong>{1}</strong> to keep your "
-#~ "primitive and ignore the deleted state.<br>Your primitive will be assigend a "
-#~ "new id.<br>Click <strong>{2}</strong> to accept the state on the server and "
-#~ "to delete your primitive.<br>Click <strong>{3}</strong> to cancel.<br>"
+#~ "<html>The OSM primitive with id <strong>{0}</strong> has been "
+#~ "deleted<br>on the server by another mapper.<br><br>Click <strong>{1}</"
+#~ "strong> to keep your primitive and ignore the deleted state.<br>Your "
+#~ "primitive will be assigend a new id.<br>Click <strong>{2}</strong> to "
+#~ "accept the state on the server and to delete your primitive.<br>Click "
+#~ "<strong>{3}</strong> to cancel.<br>"
 #~ msgstr ""
-#~ "<html>OSM primitiv id <strong>{0}</strong> har raderats på servern<br>av en "
-#~ "annan kartograf.<br><br>Klicka <strong>{1}</strong> för att behålla ditt "
-#~ "primitiv och ignorera det raderade tillståndet.<br>Ditt primitiv kommer att "
-#~ "tilldelas ett nytt id.<br>Klicka <strong>{2}</strong> för att acceptera det "
-#~ "nya tillståndet på servern och radera ditt primitiv.<br>Klicka "
-#~ "<strong>{3}</strong> för att avbryta.<br>"
-
-#, java-format
+#~ "<html>OSM primitiv id <strong>{0}</strong> har raderats på servern<br>av "
+#~ "en annan kartograf.<br><br>Klicka <strong>{1}</strong> för att behålla "
+#~ "ditt primitiv och ignorera det raderade tillståndet.<br>Ditt primitiv "
+#~ "kommer att tilldelas ett nytt id.<br>Klicka <strong>{2}</strong> för att "
+#~ "acceptera det nya tillståndet på servern och radera ditt primitiv."
+#~ "<br>Klicka <strong>{3}</strong> för att avbryta.<br>"
+
 #~ msgid ""
-#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for individual "
-#~ "update. Please reduce the selection<br>to max. {1} primitives.</html>"
+#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
+#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
+#~ "</html>"
 #~ msgstr ""
-#~ "<html>Det finns <strong>{0}</strong> primitiv<br>markerade för individuell "
-#~ "uppdatering. Vänligen reducera<br>urvalet till max {1} primitiv.</html>"
+#~ "<html>Det finns <strong>{0}</strong> primitiv<br>markerade för "
+#~ "individuell uppdatering. Vänligen reducera<br>urvalet till max {1} "
+#~ "primitiv.</html>"
 
 #~ msgid "Selection too big"
@@ -34012,11 +34267,10 @@
 #~ msgstr "vägar"
 
-#, java-format
 #~ msgid ""
 #~ "Current number of changes exceeds the max. number of changes, current is "
 #~ "{0}, max is {1}"
 #~ msgstr ""
-#~ "Antal ändringar överskrider det maximala antalet ändringar, antal ändringar "
-#~ "är {0}, max är {1}"
+#~ "Antal ändringar överskrider det maximala antalet ändringar, antal "
+#~ "ändringar är {0}, max är {1}"
 
 #~ msgid "Failed to initialize API. Please try again later."
@@ -34026,5 +34280,4 @@
 #~ msgstr "Inga data"
 
-#, java-format
 #~ msgid ""
 #~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
@@ -34033,25 +34286,23 @@
 #~ msgstr ""
 #~ "<html>Uppladdning <strong>misslyckades</strong> eftersom en primitiv du "
-#~ "försökte<br>ta bort från servern redan är borttagen.<br><br>Felmeddelandet "
-#~ "är:<br>{0}</html>"
-
-#, java-format
+#~ "försökte<br>ta bort från servern redan är borttagen."
+#~ "<br><br>Felmeddelandet är:<br>{0}</html>"
+
 #~ msgid ""
 #~ "<html>There are {0} primitives in your local dataset which<br>might be "
 #~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
-#~ "to check the state of these primitives<br>on the server.<br>Click "
+#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
+#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
 #~ "<strong>{2}</strong> to ignore.<br></html>"
 #~ msgstr ""
-#~ "<html>Det finns {0} primitiver i din data som kanske<br> är borttagna från "
-#~ "servern. Om du senare försöker ta bort eller<br> uppdatera de från servern "
-#~ "kommer det troligtvis leda till<br> en konflikt.<br><br>Klicka på "
-#~ "<strong>{1}</strong> för att kontrollera statusen på dessa primitiv<br> på "
-#~ "servern.<br>Klicka på <strong>{2}</strong> för att ignorera.<br></html>"
+#~ "<html>Det finns {0} primitiver i din data som kanske<br> är borttagna "
+#~ "från servern. Om du senare försöker ta bort eller<br> uppdatera de från "
+#~ "servern kommer det troligtvis leda till<br> en konflikt.<br><br>Klicka på "
+#~ "<strong>{1}</strong> för att kontrollera statusen på dessa primitiv<br> "
+#~ "på servern.<br>Klicka på <strong>{2}</strong> för att ignorera.<br></html>"
 
 #~ msgid "Conflicts in data"
 #~ msgstr "Datakonflikter"
 
-#, java-format
 #~ msgid ""
 #~ "WARNING: launching browser windows for the first {0} of {1} selected "
@@ -34064,5 +34315,4 @@
 #~ msgstr "Felaktigt antal parametrar för nodoperator."
 
-#, java-format
 #~ msgid ""
 #~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
@@ -34070,22 +34320,22 @@
 #~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
 #~ msgstr[0] ""
-#~ "Det finns osparade ändringar i {0} lager. Förkasta ändringarna och fortsätt?"
+#~ "Det finns osparade ändringar i {0} lager. Förkasta ändringarna och "
+#~ "fortsätt?"
 #~ msgstr[1] ""
-#~ "Det finns osparade ändringar i {0} lager. Förkasta ändringarna och fortsätt?"
+#~ "Det finns osparade ändringar i {0} lager. Förkasta ändringarna och "
+#~ "fortsätt?"
 
 #~ msgid "Download referrers from OSM..."
 #~ msgstr "Laddar ner referenser från OSM..."
 
-#, java-format
 #~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</A>."
 
-#, java-format
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
 #~ msgstr ""
-#~ "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</A> eller <A "
-#~ "HREF=\"{1}\">ditt språk</A>."
+#~ "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</A> eller <A HREF="
+#~ "\"{1}\">ditt språk</A>."
 
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
@@ -34093,23 +34343,19 @@
 
 #~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
 #~ msgstr ""
-#~ "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</A> eller <A "
-#~ "HREF=\"{1}\">ditt språk</A>."
-
-#, java-format
+#~ "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</A> eller <A HREF="
+#~ "\"{1}\">ditt språk</A>."
+
 #~ msgid "Parameter ''{0}'' must not be null."
 #~ msgstr "parametern ''{0}'' får inte vara null"
 
-#, java-format
 #~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 #~ msgstr "förväntade instans av OsmDataLayer eller GpxLayer. Erhöll \"{0}\"."
 
-#, java-format
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "oförväntat returvärde. Erhöll {0}"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
 #~ msgstr "Parameter {0} > 0 krävs. Erhöll {1}."
@@ -34118,5 +34364,4 @@
 #~ msgstr "Det finns inget primitiv med version {0} i denna historik"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 #~ msgstr "parameter \"{0}\" förväntades inom området 0...{1}, erhöll {2}"
@@ -34128,13 +34373,10 @@
 #~ msgstr "ingen senaste version funnen. Historiken är tom."
 
-#, java-format
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Kunde inte öppna \"{0}\""
 
-#, java-format
 #~ msgid "Id > 0 required, got {0}"
 #~ msgstr "Id > 0 krävs, har {0}"
 
-#, java-format
 #~ msgid ""
 #~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
@@ -34156,5 +34398,4 @@
 #~ msgstr "Sträckan \"till\" börjar eller slutar inte i \"via\"-sträckan."
 
-#, java-format
 #~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
 #~ msgstr "Mönstersyntaxfel: Mönster {0} i {1} är inte giltigt!"
Index: /applications/editors/josm/i18n/po/tr.po
===================================================================
--- /applications/editors/josm/i18n/po/tr.po	(revision 21970)
+++ /applications/editors/josm/i18n/po/tr.po	(revision 21971)
@@ -10,6 +10,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:18+0000\n"
+"POT-Creation-Date: 2010-06-23 22:47+0200\n"
+"PO-Revision-Date: 2010-06-15 18:03+0000\n"
 "Last-Translator: Angel Spy <melissadilara@yahoo.com>\n"
 "Language-Team: Türkçe\n"
@@ -18,5 +18,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-06-15 16:21+0000\n"
+"X-Launchpad-Export-Date: 2010-06-23 20:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -25,5 +25,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
@@ -95,5 +95,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
@@ -250,5 +250,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
@@ -271,5 +271,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
@@ -277,6 +277,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
@@ -285,4 +287,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
@@ -320,6 +324,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 ""
 
@@ -343,9 +347,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
@@ -405,4 +409,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
@@ -442,5 +447,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 "Bilgi"
@@ -652,5 +657,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
@@ -665,5 +670,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 "Sil"
@@ -912,4 +917,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 ""
@@ -920,4 +926,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 "Bu kazayla silinmiş nodları yönetebilir."
@@ -1466,6 +1473,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
@@ -1492,4 +1499,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
@@ -1498,6 +1507,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 "Hata"
@@ -1611,6 +1620,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 ""
 
@@ -1646,8 +1654,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 ""
@@ -1656,5 +1666,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 ""
@@ -1662,16 +1673,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 "Lütfen basitleştime için en az bir yol seçiniz."
@@ -1680,13 +1696,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 ""
@@ -1695,8 +1714,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"
@@ -1706,4 +1727,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)"
@@ -1829,6 +1851,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 "* Birden fazla yol için veya şu yollardan biri için, veya"
 
@@ -1900,9 +1921,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)"
@@ -1919,5 +1940,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
@@ -1981,5 +2002,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 "Yüklenilecek değişiklik yok."
@@ -1997,14 +2017,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 ""
@@ -2258,5 +2278,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
@@ -2374,6 +2394,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 ""
 "Çalan dosyayı sürükle ve bir izin yakınında bırak; SHIFT+bıraksesi "
@@ -2458,6 +2478,6 @@
 "move zoom with right button"
 msgstr ""
-"Sürükleyerek Zoom yap; Ctrl+ veya Ctrl-; beraber taşı "
-"Ctrl+Yukarı,aşağı,sol,sağzoom taşı ise sağ klik"
+"Sürükleyerek Zoom yap; Ctrl+ veya Ctrl-; beraber taşı Ctrl+Yukarı,aşağı,sol,"
+"sağzoom taşı ise sağ klik"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48
@@ -2507,5 +2527,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."
@@ -2621,6 +2641,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 ""
 
@@ -2885,10 +2905,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
@@ -3010,5 +3034,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
@@ -3086,7 +3110,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 ""
 "İndirdiğiniz alan dışındaki bir kavşağı sileceksiniz.<br>Göremediğiniz başka "
@@ -3134,11 +3158,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"
@@ -3147,5 +3171,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 #, java-format
 msgid ""
@@ -3154,5 +3178,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}"
@@ -3360,6 +3384,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 ""
 
@@ -3442,5 +3466,5 @@
 #. *
 #. * the decimal format 999.999
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3449,5 +3473,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3456,5 +3480,5 @@
 #. *
 #. * coordinates East/North
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3501,4 +3525,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}"
@@ -3510,29 +3537,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 ""
 
@@ -3611,19 +3632,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 ""
@@ -3632,5 +3653,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 "
@@ -3638,5 +3659,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 ""
@@ -3689,6 +3710,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 ""
 
@@ -3703,5 +3723,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 "seçilmiş"
@@ -3865,6 +3885,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 ""
 
@@ -3934,5 +3953,5 @@
 #. color tiger_data
 #. </rule>
-#. 
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -3942,5 +3961,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -3949,5 +3968,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -3956,5 +3975,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -3963,5 +3982,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -3970,5 +3989,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -3977,9 +3996,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--annotation tags -->
-#. 
+#.
 #. <!--"work in progress" tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="building"/>
@@ -3988,5 +4007,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 "yapılar"
@@ -4072,5 +4091,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
@@ -4297,5 +4316,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
@@ -4304,4 +4323,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
@@ -4501,5 +4521,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
@@ -4538,6 +4558,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 ""
 
@@ -4568,5 +4588,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"
@@ -4575,5 +4595,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"
@@ -4582,5 +4602,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"
@@ -4794,6 +4814,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 ""
 
@@ -4873,6 +4892,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 ""
 
@@ -4880,6 +4899,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 ""
 
@@ -4930,6 +4949,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 ""
 
@@ -5146,10 +5165,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"
@@ -5158,10 +5179,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
@@ -5243,4 +5266,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 "boş"
@@ -5455,7 +5479,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 ""
 
@@ -5480,6 +5504,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 ""
 
@@ -5525,5 +5548,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
@@ -5596,10 +5619,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 ""
 
@@ -5622,5 +5644,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
@@ -5628,5 +5650,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 "Ekle"
@@ -5675,5 +5697,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 "Geçmiş"
@@ -5893,10 +5915,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 ""
@@ -7351,6 +7373,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 ""
 
@@ -7374,8 +7396,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 ""
 
@@ -7495,9 +7517,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 "Özellik Ekle"
 
-#: ../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."
@@ -7506,23 +7528,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 "<farklı>"
 
-#: ../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 "Değerleri Değiştir?"
 
-#: ../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"
@@ -7530,5 +7552,5 @@
 msgstr[0] "Değerleri {0} obje için değiştir"
 
-#: ../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."
@@ -7536,77 +7558,77 @@
 msgstr[0] "İşlem {0} objeyi değiştirecek."
 
-#: ../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 "Lütfen bir anahtar seçiniz"
 
-#: ../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 "Lütfen bir değer seçiniz"
 
-#: ../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 "Özelliklerini değiştirmek istediğiniz objeleri seçiniz."
 
-#: ../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 "Özellikler/Üyelikler"
 
-#: ../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 "Seçili objenin özellikleri"
 
 #. 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 "Üyesi"
 
-#: ../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 "Özellik: {0} / Üyelik: {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 "Özellik / Üyelik"
 
-#: ../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 "İlişkiyi değiştir"
 
-#: ../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 "Gerçekten seçili kısmı ilişkiden silmek istiyormusun {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 "Seçili anahtarı her objeden sil"
 
-#: ../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 "Özelliği Sil"
 
-#: ../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 "Her obje için yeni bir anahtar/değer çifti ekleyiniz"
 
-#: ../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 "Seçili anahtarın değerini her obje için düzenle"
 
-#: ../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 ""
@@ -7721,6 +7743,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 ""
 
@@ -7738,6 +7760,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 ""
 
@@ -7892,7 +7914,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 ""
 
@@ -8224,7 +8245,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 ""
 
@@ -8365,6 +8385,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 ""
 
@@ -8374,6 +8394,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 ""
 
@@ -8647,9 +8667,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 ""
 
@@ -8664,8 +8683,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 ""
 
@@ -8911,5 +8929,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 ""
@@ -8917,6 +8935,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 ""
 
@@ -9001,6 +9018,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] ""
@@ -9014,6 +9031,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 "
@@ -9239,5 +9256,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9263,6 +9280,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 ""
 
@@ -9317,6 +9333,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 ""
 
@@ -9370,7 +9386,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 ""
 
@@ -9380,5 +9396,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9394,5 +9410,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..."
@@ -9403,6 +9419,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 ""
 
@@ -9620,7 +9635,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 ""
 
@@ -9646,7 +9661,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 ""
 
@@ -9708,6 +9723,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 ""
 "<html>İşlenilmemiş GPS bilgisis yüklemek zararlı olabilir.<br>Eğer izleri "
@@ -9888,6 +9903,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 ""
 
@@ -9943,7 +9958,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 ""
 "<html>Zaman hesaplanırken GPS alıcınız fotoğrafını göster.<br>Fotoğrafı "
@@ -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 "Silmek için bir satır seçiniz."
@@ -11432,6 +11446,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 "Yön çizgi okları için tablo değerlerini kullan hesap yapma."
 
@@ -11490,6 +11503,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 "Daha düzgün harita grafikleri için 'antialiasing' uygula  ."
 
@@ -11561,5 +11573,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 "Önceden tanımlanmış ayarları etkinleştir"
@@ -11579,6 +11591,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>:"
@@ -11703,6 +11714,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 ""
 
@@ -11715,9 +11726,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 ""
 
@@ -12016,6 +12027,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 ""
 
@@ -12026,5 +12037,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 ""
@@ -12034,18 +12045,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 ""
@@ -12054,5 +12065,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 ""
@@ -12061,5 +12072,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 ""
@@ -12068,9 +12079,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 "Etiketleme Ayarları"
@@ -12179,6 +12190,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 ""
 
@@ -12200,6 +12211,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 ""
 
@@ -12277,6 +12288,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 ""
 
@@ -12292,6 +12302,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 ""
 
@@ -12385,6 +12394,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 ""
 
@@ -12516,4 +12525,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 "Özellikleri Değiştir"
@@ -12679,5 +12689,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
@@ -12697,5 +12707,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}''"
@@ -12862,6 +12872,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 ""
 
@@ -12978,10 +12987,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 ""
@@ -12989,69 +12998,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 "Kapanıyor..."
 
-#: ../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}."
@@ -13229,4 +13238,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})"
@@ -13246,6 +13256,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 ""
 
@@ -13273,6 +13283,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 ""
 
@@ -13314,6 +13324,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 ""
 
@@ -13749,6 +13758,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 ""
 
@@ -13957,6 +13966,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 ""
 
@@ -14023,5 +14031,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"
@@ -14104,6 +14112,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 ""
 
@@ -14111,7 +14119,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 ""
 
@@ -14119,7 +14127,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 ""
 
@@ -14127,8 +14135,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 ""
 
@@ -14148,7 +14156,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 ""
 
@@ -14217,7 +14225,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 ""
 
@@ -14229,7 +14236,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 ""
 
@@ -14261,6 +14268,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 ""
 
@@ -14767,6 +14774,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>"
@@ -14793,6 +14800,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"
@@ -14830,6 +14837,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"
@@ -14845,7 +14852,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"
@@ -14896,9 +14903,29 @@
 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 "Binalar"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#, fuzzy
+msgid "Rotate crosshair"
+msgstr "Görüntüyü sağa dönder"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#, fuzzy
+msgid "Advanced settings"
+msgstr "İleri Tercihler"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#, fuzzy
+msgid "Building tag:"
+msgstr "Bina"
+
+#: ../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"
@@ -14907,35 +14934,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 "Kamu Binası"
+
+#: ../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 ""
 
@@ -15110,7 +15146,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--waterway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15120,5 +15156,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15128,5 +15164,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15142,5 +15178,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15150,5 +15186,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15156,8 +15192,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 "su"
@@ -15179,5 +15215,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15186,5 +15222,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15193,5 +15229,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15200,5 +15236,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15207,5 +15243,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15214,10 +15250,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 "adres"
@@ -15246,11 +15282,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 ""
 
@@ -15676,6 +15711,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 "Boş Tabaka"
@@ -15858,4 +15893,51 @@
 msgstr "GPX veri tabaksı bulunamadı."
 
+#: ../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 "Hayvanat Bahçesi Düzenle"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#, fuzzy
+msgid "Name:"
+msgstr "İsim"
+
+#: ../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
+#, fuzzy, java-format
+msgid "Delete tool \"{0}\"?"
+msgstr "İlişkiyi sil {0}"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:74
+msgid "Are you sure?"
+msgstr "Emin misiniz?"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
+#, fuzzy
+msgid "New tool..."
+msgstr "Yeni Rol"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
+#, fuzzy
+msgid "Install"
+msgstr "Endüstriyel"
+
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
 msgid "Position only"
@@ -16124,5 +16206,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#. 
+#.
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16243,6 +16325,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 "Oluşturulan yol için max. segment sayısı. Varsayılan 250."
 
@@ -16265,7 +16346,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 ""
 "Douglas-Peucker hat basitleştirme hassasiyeti, açı olarak verilir.<br>düşük "
@@ -16297,6 +16377,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
-msgstr ""
-"Yolu su, sahilşeridi,kara veya hiçbişi olarak etiketle. Varsayılan Su."
+msgstr "Yolu su, sahilşeridi,kara veya hiçbişi olarak etiketle. Varsayılan Su."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
@@ -16580,6 +16659,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 "Başlık çeşitli değerler taşır ve bir metine atanamaz."
 
@@ -16689,6 +16767,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 ""
 
@@ -16741,6 +16818,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 ""
 
@@ -17106,5 +17182,5 @@
 msgstr "Değiştir"
 
-#: ../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}"
@@ -17155,4 +17231,43 @@
 msgid "Revert changeset #{0}"
 msgstr ""
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:78
+#, fuzzy
+msgid "Road Sign Plugin"
+msgstr "Eklentiler yükleniyor"
+
+#: ../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 "Etiketteki özellikler okunamadı: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
+#, fuzzy, java-format
+msgid "Error parsing tagging preset from ''{0}'':\n"
+msgstr ""
+"Değerlerin okunmasında Hata {0}:\n"
+" {1}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:104
+#, fuzzy, java-format
+msgid "Sign {0}"
+msgstr "Seçim: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:111
+#, fuzzy, java-format
+msgid "Additional sign {0}"
+msgstr "İlişki ekle {0}"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -17259,4 +17374,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 "Yolu Basitleştir"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
+#, fuzzy
+msgid "Delete unnecessary nodes from an area."
+msgstr "Yoldan gereksiz noktaları sil."
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
 msgid "Slippy Map"
@@ -18048,6 +18174,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 ""
 
@@ -18133,8 +18259,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 ""
 
@@ -18188,8 +18314,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 ""
 
@@ -18301,6 +18427,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 ""
 
@@ -18308,6 +18434,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 ""
 
@@ -18963,7 +19089,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 ""
 "İmla kontrolu için kaynak dosya veya link veya etiket kontolcusu veri dosyası"
@@ -18991,6 +19116,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 msgid "Validate that property values are valid checking against presets."
-msgstr ""
-"Önceden tanımlı değerleri kullanarak, özellik değerlerini kontrol et."
+msgstr "Önceden tanımlı değerleri kullanarak, özellik değerlerini kontrol et."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
@@ -19161,9 +19285,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 "alan"
@@ -19261,11 +19385,145 @@
 msgstr "{0}, ..."
 
-#: ../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
+#, fuzzy, java-format
+msgid "{0} {1}% of GPS track"
+msgstr "{0} {1} izden oluşur"
+
+#: ../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 "Sesi içeri al"
+
+#: ../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 "Kaldır"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
+#, fuzzy
+msgid "removes current video from layer"
+msgstr "Fotoğrafı tabakadan kaldır"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
+#, fuzzy
+msgid "play/pause"
+msgstr "Oynat/Dondur"
+
+#: ../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 "arkaplan"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
+#, fuzzy
+msgid "jumps n sec back"
+msgstr "Geri Atla."
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "forward"
+msgstr "İleri"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "jumps n sec forward"
+msgstr "İleri atla"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
+#, fuzzy
+msgid "faster"
+msgstr "Hızlı"
+
+#: ../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 "Yavaş"
+
+#: ../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 "Devamlı olarak canlı GPS tabakasını görüntünün ortasına getir"
+
+#. 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
+#, fuzzy
+msgid "Loop length"
+msgstr "Uzunluk: "
+
+#: ../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 "tabaka"
+
+#: ../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 ""
 
@@ -19478,28 +19736,28 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
 msgid "Automatic downloading"
 msgstr "Otomatik indir"
 
-#: ../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 "WMS tabaksı ({0}), otomatik indirildi, görüntü seviyesi {1}"
 
-#: ../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 "WMS tabakası ({0}), görüntü seviyesi {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
 #, java-format
 msgid ""
@@ -19510,17 +19768,17 @@
 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 "Görünen mozaikleri indir"
 
-#: ../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"
@@ -19529,96 +19787,96 @@
 "değiştirin"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329
 msgid "Change resolution"
 msgstr "Çözünürlüğü değiştir"
 
-#: ../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 "WMS tabakasını dosyaya kaydet"
 
-#: ../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 "WMS tabakasını dosyadan yükle"
 
-#: ../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 "Desteklenmeyen WMS versiyonu; bulunan {0}, istenen {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
 msgid "File Format Error"
 msgstr "Dosya Format Hatası"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449
 msgid "Error loading file"
 msgstr "Dosya Yüklemede Sorun"
 
-#: ../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 "Veri yüklemek için boş bir WMS tabakası aç"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
 msgid "WMS Plugin Preferences"
 msgstr "WMS Eklenti Tercihleri"
 
-#: ../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 "WMS eklenti menusundeki, WMS server listesini değiştir"
 
-#: ../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 "Menu İsmi"
 
-#: ../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 "WMS linki"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "Menu Name (Default)"
 msgstr "Menu ismi (Varsayılan)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "WMS URL (Default)"
 msgstr "WMS linki (Varsayılan)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:86
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
 msgid "Enter a menu name and WMS URL"
 msgstr "Menu ismi ve WMS linki kullanınız"
 
-#: ../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 ""
@@ -19634,4 +19892,8 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
 msgid "% of north:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186
+msgid "Simultaneous connections"
 msgstr ""
 
@@ -19644,7 +19906,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
@@ -19696,8 +19958,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 "orman"
@@ -19714,7 +19976,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--boundary tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -19724,5 +19986,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -19765,5 +20027,5 @@
 #. color boundary
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -19773,5 +20035,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -19781,5 +20043,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -19789,15 +20051,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 "sınırlar"
@@ -19813,5 +20075,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -19820,7 +20082,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--route tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -19830,5 +20092,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -19838,5 +20100,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -19846,5 +20108,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -19854,5 +20116,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -19862,5 +20124,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -19870,5 +20132,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -19878,12 +20140,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 "rut"
@@ -20160,21 +20422,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 "
@@ -20184,10 +20445,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."
@@ -20195,5 +20456,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 "
@@ -20203,15 +20464,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 "
@@ -20220,5 +20481,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 "
@@ -20228,15 +20489,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"
@@ -20244,5 +20505,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."
@@ -20250,5 +20511,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 "
@@ -20257,5 +20518,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 "
@@ -20264,10 +20525,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."
@@ -20275,15 +20536,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 "
@@ -20292,10 +20554,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 "
@@ -20304,15 +20573,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 "
@@ -20322,10 +20591,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). "
@@ -20334,5 +20603,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) "
@@ -20341,5 +20610,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:89
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20348,10 +20617,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 "
@@ -20360,5 +20629,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 "
@@ -20368,5 +20637,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:97
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20375,15 +20644,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 "
@@ -20392,5 +20661,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:105
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21280,10 +21549,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 "döner kavşak"
@@ -21420,8 +21689,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"/>
@@ -21631,5 +21900,5 @@
 #. color motorroad
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21639,5 +21908,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21656,5 +21925,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21664,5 +21933,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21681,5 +21950,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -21689,5 +21958,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -21706,5 +21975,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -21714,5 +21983,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -21727,5 +21996,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -21743,8 +22012,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 "yerleşim_alanı"
@@ -21759,5 +22028,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -21766,5 +22035,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--public_transport tags -->
 #. <rule>
@@ -21774,10 +22043,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 "servis"
@@ -21792,5 +22061,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -21799,5 +22068,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -21807,10 +22076,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 "inşaat"
@@ -22816,9 +23085,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 "batak"
@@ -23148,5 +23417,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -23156,5 +23425,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -23164,5 +23433,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -23172,5 +23441,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -23180,5 +23449,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -23188,5 +23457,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -23196,5 +23465,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -23205,5 +23474,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -23211,9 +23480,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 "demiryolu"
@@ -24623,5 +24892,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24631,5 +24900,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24639,5 +24908,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24647,5 +24916,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -25009,7 +25278,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--sport tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -25019,5 +25288,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -25027,5 +25296,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -25035,5 +25304,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -25043,5 +25312,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -25051,5 +25320,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -25059,5 +25328,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -25067,5 +25336,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -25075,5 +25344,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -25083,5 +25352,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -25091,5 +25360,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -25099,5 +25368,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -25107,5 +25376,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -25115,5 +25384,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -25123,5 +25392,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -25131,5 +25400,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -25139,5 +25408,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -25147,5 +25416,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -25155,5 +25424,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -25163,5 +25432,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -25171,5 +25440,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -25179,5 +25448,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -25187,5 +25456,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -25195,5 +25464,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -25203,5 +25472,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -25211,5 +25480,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -25219,5 +25488,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -25227,5 +25496,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -25235,5 +25504,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -25243,5 +25512,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -25251,5 +25520,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -25259,5 +25528,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -25267,5 +25536,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -25275,5 +25544,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -25283,5 +25552,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -25291,5 +25560,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -25299,5 +25568,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -25307,5 +25576,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -25315,5 +25584,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -25323,5 +25592,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -25331,5 +25600,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -25339,5 +25608,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -25347,5 +25616,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -25355,5 +25624,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -25363,5 +25632,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -25371,5 +25640,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -25379,33 +25648,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 "spor"
@@ -27083,7 +27352,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--landuse tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -27093,5 +27362,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -27101,5 +27370,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -27109,5 +27378,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -27117,5 +27386,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -27125,5 +27394,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -27133,5 +27402,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -27141,5 +27410,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -27149,12 +27418,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 "yeşil"
@@ -28570,5 +28839,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -28584,5 +28853,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28592,18 +28861,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 -->
@@ -28612,7 +28898,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- cycleway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28622,5 +28908,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28630,5 +28916,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28638,5 +28924,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28646,12 +28932,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 "bisiklet"
@@ -28678,5 +28965,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -28692,5 +28979,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -28700,5 +28987,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28707,13 +28994,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"/>
@@ -28724,11 +29019,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 "ayak"
@@ -28747,8 +29043,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 "metro"
@@ -28860,9 +29156,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
@@ -28870,5 +29166,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,
@@ -28878,8 +29174,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
@@ -28893,5 +29189,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#. 
+#.
 #: build/trans_style.java:72
 msgid "standard"
@@ -28899,5 +29195,5 @@
 
 #. mappaint style named "standard"
-#. 
+#.
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -28946,6 +29242,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>
@@ -29025,5 +29321,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -29033,16 +29329,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 "kırılmış"
@@ -29053,5 +29349,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -29060,5 +29356,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -29067,5 +29363,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -29081,5 +29377,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -29093,5 +29389,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -29100,5 +29396,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -29107,5 +29403,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -29114,5 +29410,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -29121,5 +29417,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -29128,5 +29424,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -29135,5 +29431,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxweight"/>
@@ -29142,5 +29438,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxheight"/>
@@ -29149,5 +29445,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -29156,5 +29452,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxlength"/>
@@ -29163,5 +29459,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -29170,5 +29466,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="minspeed"/>
@@ -29177,5 +29473,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxstay"/>
@@ -29184,5 +29480,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="toll"/>
@@ -29191,5 +29487,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="barrier"/>
@@ -29366,7 +29662,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- highway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -29380,5 +29676,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -29388,7 +29684,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- tracktype tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -29398,5 +29694,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -29406,5 +29702,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -29414,5 +29710,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -29422,10 +29718,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 "araçyolu_hattı"
@@ -29436,5 +29732,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -29443,5 +29739,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -29451,5 +29747,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -29458,5 +29754,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -29465,5 +29761,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -29472,5 +29768,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -29479,5 +29775,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -29486,5 +29782,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -29493,5 +29789,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -29500,5 +29796,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -29507,5 +29803,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -29514,8 +29810,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 ""
@@ -29526,8 +29822,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 ""
@@ -29538,5 +29834,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -29545,8 +29841,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 "döner kavşak"
@@ -29557,9 +29853,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 ""
@@ -29570,9 +29866,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 "riverbank"
@@ -29583,8 +29879,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 "akış"
@@ -29595,8 +29891,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 "iskele"
@@ -29607,5 +29903,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29614,5 +29910,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29621,5 +29917,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29629,5 +29925,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29636,5 +29932,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29643,5 +29939,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29650,5 +29946,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29658,5 +29954,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29667,5 +29963,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -29675,7 +29971,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--man_made tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -29685,5 +29981,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -29693,5 +29989,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -29701,5 +29997,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -29710,5 +30006,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -29717,5 +30013,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -29725,5 +30021,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -29733,5 +30029,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -29741,5 +30037,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -29749,5 +30045,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -29757,5 +30053,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -29765,5 +30061,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -29773,5 +30069,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -29781,5 +30077,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -29789,18 +30085,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 "insan yapımı"
@@ -29810,9 +30106,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 ""
@@ -29823,7 +30119,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- railway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -29833,5 +30129,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -29840,5 +30136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -29848,5 +30144,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -29855,5 +30151,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -29863,5 +30159,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -29871,10 +30167,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 "demiryolu_noktası"
@@ -29885,5 +30181,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -29894,13 +30190,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 "başka_demiryolu"
 
 #. color otherrail
-#: build/trans_style.java:1192
+#: build/trans_style.java:1217
 msgid "railover"
 msgstr "demiryolu_üzeri"
@@ -29911,5 +30207,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -29919,5 +30215,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29930,5 +30226,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29936,7 +30232,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 "eski_demiryolu"
@@ -29947,5 +30243,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -29954,5 +30250,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -29961,5 +30257,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -29968,7 +30264,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aeroway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -29979,9 +30275,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 "havayolu"
@@ -29992,8 +30288,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 "terminal"
@@ -30004,5 +30300,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -30012,8 +30308,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 "havayolu_ağır"
@@ -30024,8 +30320,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 "hafif_hafif"
@@ -30036,5 +30332,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -30043,5 +30339,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -30050,7 +30346,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aerialway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -30060,5 +30356,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -30068,5 +30364,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -30076,5 +30372,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -30084,5 +30380,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -30092,10 +30388,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 "havayolu"
@@ -30106,11 +30402,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 "basit_meydan"
@@ -30121,9 +30417,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 "orta_meydan"
@@ -30134,9 +30430,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 "büyük_meydan"
@@ -30147,9 +30443,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 ""
@@ -30160,9 +30456,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 "acemiKullanıcı_meydanı"
@@ -30173,9 +30469,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 "acemiKullanıcı_meydanı"
@@ -30186,7 +30482,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--power tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -30196,5 +30492,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -30203,5 +30499,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -30211,5 +30507,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -30219,5 +30515,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -30227,5 +30523,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -30235,5 +30531,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -30243,5 +30539,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -30251,5 +30547,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -30259,5 +30555,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -30267,5 +30563,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -30275,5 +30571,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -30283,5 +30579,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -30291,15 +30587,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 "güç"
@@ -30309,9 +30605,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 "iskele"
@@ -30322,8 +30618,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 "suhattı"
@@ -30333,7 +30629,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--leisure tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -30343,5 +30639,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -30351,5 +30647,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -30359,5 +30655,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -30367,5 +30663,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -30375,5 +30671,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -30383,5 +30679,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -30391,5 +30687,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -30399,5 +30695,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -30407,5 +30703,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -30415,5 +30711,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -30423,5 +30719,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -30431,5 +30727,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -30439,5 +30735,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -30447,5 +30743,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -30455,5 +30751,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -30463,17 +30759,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 "dinlenme_yeri"
@@ -30483,9 +30779,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 ""
@@ -30495,7 +30791,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--amenity tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -30505,5 +30801,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -30513,5 +30809,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -30521,5 +30817,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -30529,5 +30825,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -30537,5 +30833,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -30545,5 +30841,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -30553,5 +30849,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -30561,5 +30857,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -30569,5 +30865,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -30577,14 +30873,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 "dinlenme_yeri"
@@ -30594,5 +30890,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30602,5 +30898,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30610,5 +30906,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30618,5 +30914,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30626,5 +30922,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30634,5 +30930,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30642,5 +30938,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30650,5 +30946,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30658,5 +30954,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30666,5 +30962,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -30674,5 +30970,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -30682,14 +30978,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 "tail_trafiği"
@@ -30699,5 +30995,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -30706,5 +31002,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -30714,5 +31010,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -30721,5 +31017,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -30729,5 +31025,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -30737,5 +31033,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -30745,5 +31041,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -30752,5 +31048,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -30760,5 +31056,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -30768,5 +31064,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -30776,5 +31072,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -30784,5 +31080,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -30791,5 +31087,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -30798,5 +31094,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -30805,5 +31101,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -30812,5 +31108,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -30819,5 +31115,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -30826,5 +31122,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -30833,5 +31129,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -30840,5 +31136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -30847,5 +31143,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -30854,5 +31150,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -30861,5 +31157,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -30868,5 +31164,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -30875,5 +31171,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -30883,5 +31179,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -30891,5 +31187,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -30899,5 +31195,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -30907,5 +31203,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -30915,5 +31211,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -30923,5 +31219,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -30931,5 +31227,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -30939,5 +31235,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -30947,5 +31243,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -30956,5 +31252,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -30964,5 +31260,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -30972,5 +31268,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -30980,5 +31276,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -30988,5 +31284,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -30996,5 +31292,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -31004,5 +31300,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -31012,5 +31308,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -31020,5 +31316,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -31028,5 +31324,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -31036,5 +31332,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -31044,5 +31340,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -31052,5 +31348,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -31060,5 +31356,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -31068,5 +31364,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -31076,5 +31372,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"/>
@@ -31084,5 +31388,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -31092,5 +31396,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -31100,5 +31404,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -31108,5 +31412,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -31115,27 +31419,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 "eski_sokak_lambası"
@@ -31145,5 +31450,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -31153,5 +31458,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -31161,12 +31466,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 "su_lambası"
@@ -31176,5 +31481,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -31184,5 +31489,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -31192,5 +31497,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -31200,5 +31505,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -31208,5 +31513,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -31216,5 +31521,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -31224,11 +31529,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 "sağlık"
@@ -31238,7 +31543,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--shop tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -31248,5 +31553,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -31256,5 +31561,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -31264,5 +31569,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -31272,5 +31577,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -31280,5 +31585,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -31288,5 +31593,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -31296,5 +31601,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -31304,5 +31609,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -31312,5 +31617,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -31320,5 +31625,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -31328,5 +31633,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -31336,5 +31641,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -31344,5 +31649,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -31352,5 +31657,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -31360,5 +31665,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -31368,5 +31673,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -31376,5 +31681,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -31384,5 +31689,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -31392,5 +31697,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -31400,5 +31705,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -31408,5 +31713,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -31416,5 +31721,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -31424,5 +31729,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -31432,5 +31737,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -31440,5 +31745,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -31448,5 +31753,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -31456,5 +31761,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -31464,5 +31769,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -31472,5 +31777,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -31480,5 +31785,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -31488,5 +31793,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -31496,5 +31801,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -31504,5 +31809,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -31512,5 +31817,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -31520,5 +31825,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -31528,5 +31833,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -31536,5 +31841,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -31544,5 +31849,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -31552,5 +31857,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -31560,5 +31865,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -31568,5 +31873,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -31576,31 +31881,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 "alışveriş"
@@ -31610,7 +31915,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--tourism tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31620,5 +31925,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31628,5 +31933,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31636,5 +31941,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31644,5 +31949,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31652,5 +31957,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31660,5 +31965,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31668,12 +31973,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 "hotel"
@@ -31683,5 +31988,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -31691,5 +31996,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -31699,5 +32004,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -31707,5 +32012,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -31715,5 +32020,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -31723,5 +32028,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -31732,5 +32037,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -31740,5 +32045,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- information tags -->
 #. <rule>
@@ -31748,5 +32053,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -31756,5 +32061,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -31763,5 +32068,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -31770,13 +32075,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 "turizm"
@@ -31786,7 +32091,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--historic tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -31796,5 +32101,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -31804,5 +32109,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -31812,5 +32117,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -31820,5 +32125,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -31828,5 +32133,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -31836,5 +32141,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -31844,5 +32149,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -31852,5 +32157,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -31860,13 +32165,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 "tarihi"
@@ -31876,8 +32181,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 "taş_ocağı"
@@ -31888,8 +32193,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 "toprak_doldurma"
@@ -31900,5 +32205,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -31908,8 +32213,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 "havza"
@@ -31920,8 +32225,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 "çiftlik"
@@ -31932,6 +32237,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
-#. 
+#.
+#.
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -31941,8 +32246,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 "perakende"
@@ -31953,8 +32258,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 "endüstri"
@@ -31965,8 +32270,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 "ağaçsız_alan"
@@ -31977,8 +32282,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 "yeşil_alan"
@@ -31989,8 +32294,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 "demiryolu"
@@ -32001,5 +32306,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -32009,7 +32314,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--military tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -32019,5 +32324,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -32027,5 +32332,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -32035,5 +32340,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -32043,11 +32348,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 "askeri"
@@ -32058,8 +32363,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 "mezarlık"
@@ -32069,8 +32374,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 "zirve"
@@ -32081,9 +32386,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 "buzul"
@@ -32093,9 +32398,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 "volkanik"
@@ -32105,5 +32410,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -32114,5 +32419,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -32122,5 +32427,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -32130,5 +32435,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -32138,5 +32443,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -32146,12 +32451,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 "doğal"
@@ -32161,9 +32466,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 "çalılık"
@@ -32173,9 +32478,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 "çalılık"
@@ -32185,9 +32490,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 ""
@@ -32197,9 +32502,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 "çamur"
@@ -32209,9 +32514,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 "sahil"
@@ -32222,5 +32527,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?
@@ -32246,5 +32551,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -32255,11 +32560,11 @@
 #. </rule>
 #. -->
-#. 
+#.
 #. <!--name tags -->
-#. 
+#.
 #. <!--preferences tags -->
-#. 
+#.
 #. <!--place tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -32269,5 +32574,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -32277,5 +32582,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -32285,5 +32590,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -32293,5 +32598,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -32301,5 +32606,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -32309,5 +32614,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -32317,5 +32622,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -32325,5 +32630,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -32333,5 +32638,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -32341,5 +32646,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -32349,5 +32654,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -32357,15 +32662,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 "yer"
@@ -32375,9 +32680,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 ""
@@ -32468,5 +32773,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#. 
+#.
 #. Data type can be:
 #. node        - a node point
@@ -32474,28 +32779,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
@@ -32610,5 +32915,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#. 
+#.
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32621,5 +32926,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>
@@ -32644,6 +32949,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#. 
-#. 
+#.
+#.
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32652,6 +32957,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#. 
-#. 
+#.
+#.
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32666,6 +32971,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
@@ -32679,6 +32984,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
@@ -32698,6 +33003,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#. 
-#. 
+#.
+#.
 #. only for Japan
 #: build/trans_wms.java:39
@@ -32721,6 +33026,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
@@ -32741,5 +33046,4 @@
 #~ msgstr "Eklenti kaldırılamıyor, Lütfen JOSM u edindiğiniz yere danışın"
 
-#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Lütfen {0} 'daki problemi bildiriniz"
@@ -32749,6 +33053,6 @@
 
 #~ 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 ""
 #~ "Hatayı bildirmeden önce JOSM'un ve eklentilerin son versiyonunu edinmeyi "
@@ -32768,5 +33072,6 @@
 #~ "some time."
 #~ msgstr ""
-#~ "Server bir hata bildirdi. Küçük bir alan deneyiniz veya daha sonra yapınız."
+#~ "Server bir hata bildirdi. Küçük bir alan deneyiniz veya daha sonra "
+#~ "yapınız."
 
 #~ msgid "Unknown version"
@@ -32797,5 +33102,4 @@
 #~ msgstr "Enter Password"
 
-#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Eklenti Bulunamadı: {0}."
@@ -32829,5 +33133,4 @@
 #~ msgstr "Fare veya Ctrl+ok tuşları ile /./  zoom ve pan yapabilirsin."
 
-#, java-format
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "''{1}'' gurubu için ''{0}'' kullan"
@@ -32858,9 +33161,8 @@
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version selected "
-#~ "in the history list."
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
 #~ msgstr "Seçili objelerin durumlarını geçmiş listesinde seçili olana çevir"
 
-#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "Yazarlar: {0}"
@@ -32869,5 +33171,4 @@
 #~ msgstr "Seçili tabakayı sil."
 
-#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Komut Yığını: {0}"
@@ -32879,5 +33180,4 @@
 #~ msgstr "sism"
 
-#, java-format
 #~ msgid "Images for {0}"
 #~ msgstr "{0} için görüntüler"
@@ -32886,9 +33186,7 @@
 #~ msgstr "GPX Oku..."
 
-#, java-format
 #~ msgid "No time for point {0} x {1}"
 #~ msgstr "Noktalrı için {0} x {1} zaman yok"
 
-#, java-format
 #~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
 #~ msgstr "Zaman şu noktalar  \"{0}\" {1} x {2} için okunamadı"
@@ -32897,13 +33195,10 @@
 #~ msgstr "Zaman damgası okunabilen bir görüntü bulunamadı."
 
-#, java-format
 #~ msgid "GPS start: {0}"
 #~ msgstr "GPS başlangıç: {0}"
 
-#, java-format
 #~ msgid "GPS end: {0}"
 #~ msgstr "GPS bitiş: {0}"
 
-#, java-format
 #~ msgid "current delta: {0}s"
 #~ msgstr "şu anki delta: {0}s"
@@ -32913,5 +33208,4 @@
 #~ msgstr[0] "görüntü"
 
-#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} izde var."
@@ -32920,9 +33214,7 @@
 #~ msgstr "Saati eşle"
 
-#, java-format
 #~ msgid "The date in file \"{0}\" could not be parsed."
 #~ msgstr "\"{0}\" dosyasındaki zaman ayrıştırılamadı."
 
-#, java-format
 #~ msgid "There is no EXIF time within the file \"{0}\"."
 #~ msgstr "EXIF zamanı \"{0}\" dosyasında yok."
@@ -32949,6 +33241,6 @@
 #~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
 #~ msgstr ""
-#~ "Etiketleme ayarları kaynakları dosyası, yardım "
-#~ "için:http://josm.openstreetmap.de/wiki/TaggingPresets."
+#~ "Etiketleme ayarları kaynakları dosyası, yardım için:http://josm."
+#~ "openstreetmap.de/wiki/TaggingPresets."
 
 #~ msgid "Add a new tagging preset source to the list."
@@ -32961,5 +33253,4 @@
 #~ msgstr "site-josm.xml veya Wiki Pages ekle."
 
-#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -33007,5 +33298,6 @@
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you load\n"
+#~ "Parameters are read in the order they are specified, so make sure you "
+#~ "load\n"
 #~ "some data before --selection"
 #~ msgstr ""
@@ -33016,16 +33308,14 @@
 #~ msgstr "--download=<bbox> indirmek yerine osm://<bbox> kullanabilirsin\n"
 
-#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Tercihler klasörü açılamıyor: {0}"
 
 #~ 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 ""
 #~ "Güncellenen eklentilerin aktif hale getirilemedi. JOSM un var olanların "
 #~ "üzerine yazma yetkisi varmıdır kontrol ediniz."
 
-#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -33044,5 +33334,4 @@
 #~ msgstr "Dosya bulunamadı"
 
-#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -33054,11 +33343,10 @@
 #~ " {0}"
 
-#, java-format
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Eklenti indirilemedi: {0} ve {1}"
 
-#, 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 ""
 #~ "Eklenti {0} göründüğü kadarıyla linki bozuk veya otomatik indirilemiyor ."
@@ -33074,10 +33362,11 @@
 
 #~ msgid ""
-#~ "You are about to delete nodes outside of the area you have "
-#~ "downloaded.<br>This can cause problems because other objects (that you don't "
-#~ "see) might use them.<br>Do you really want to delete?"
+#~ "You are about to delete nodes outside of the area you have downloaded."
+#~ "<br>This can cause problems because other objects (that you don't see) "
+#~ "might use them.<br>Do you really want to delete?"
 #~ msgstr ""
-#~ "İndirdiğiniz alan dışındaki bir kavşağı sileceksiniz.<br>Göremediğiniz başka "
-#~ "objeler onu kullanıyor olabilir. <br>Gerçekten silmek istiyormusunuz?"
+#~ "İndirdiğiniz alan dışındaki bir kavşağı sileceksiniz.<br>Göremediğiniz "
+#~ "başka objeler onu kullanıyor olabilir. <br>Gerçekten silmek "
+#~ "istiyormusunuz?"
 
 #~ msgid "true"
@@ -33090,5 +33379,4 @@
 #~ msgstr "farklı"
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -33110,45 +33398,34 @@
 #~ msgstr "Alan stili yol kapalı değil."
 
-#, java-format
 #~ msgid "multipolygon way ''{0}'' is not closed."
 #~ msgstr "multipoligon yolu ''{0}'' kapalı değil."
 
-#, java-format
 #~ msgid "Way ''{0}'' with less than two points."
 #~ msgstr "Yol ''{0}'' iki noktadan az içeriyor."
 
-#, java-format
 #~ msgid "No useful role ''{0}'' for Way ''{1}''."
 #~ msgstr "Kullanışlı rol yok ''{0}''  ''{1}'' yolu için."
 
-#, java-format
 #~ msgid "Non-Way ''{0}'' in multipolygon."
 #~ msgstr "Yol-Değil ''{0}'' multipolygon içinde."
 
-#, java-format
 #~ msgid "No outer way for multipolygon ''{0}''."
 #~ msgstr "Multipoligon için dış yol yok ''{0}''."
 
-#, java-format
 #~ msgid "Intersection between ways ''{0}'' and ''{1}''."
 #~ msgstr "Bu ''{0}'' ve ''{1}'' yolları arasında kesişim."
 
-#, java-format
 #~ msgid "Inner way ''{0}'' is outside."
 #~ msgstr "iç yol ''{0}'' dışarıda."
 
-#, java-format
 #~ msgid "Style for inner way ''{0}'' equals multipolygon."
 #~ msgstr "İç yol stili ''{0}'' multipolygon ."
 
-#, java-format
 #~ msgid "Style for outer way ''{0}'' mismatches."
 #~ msgstr "Dış yol stili ''{0}'' bulunamadı."
 
-#, java-format
 #~ msgid "Error: {0}"
 #~ msgstr "Hata: {0}"
 
-#, java-format
 #~ msgid "Warning: {0}"
 #~ msgstr "Uyarı: {0}"
@@ -33158,6 +33435,6 @@
 
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want to "
-#~ "combine them?"
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
 #~ msgstr ""
 #~ "Seçili yollar farklı ilişkilere sahip, buna rağmen birleştirmek "
@@ -33182,13 +33459,10 @@
 #~ msgstr "Seçili alanı yükle"
 
-#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "Kontak {0}..."
 
-#, java-format
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "Link okunamadı: \"{0}\""
 
-#, java-format
 #~ msgid "Parsing error in URL: \"{0}\""
 #~ msgstr "Link ayrıştırılamadı: \"{0}\""
@@ -33201,9 +33475,9 @@
 
 #~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this as "
-#~ "a bug."
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
 #~ msgstr ""
-#~ "Program Hatası: tabakalar için durumlar kontrol edilemediLütfen hata olarak "
-#~ "bildiriniz"
+#~ "Program Hatası: tabakalar için durumlar kontrol edilemediLütfen hata "
+#~ "olarak bildiriniz"
 
 #~ msgid "No document open so nothing to save."
@@ -33270,12 +33544,10 @@
 #~ "Devam etmek istiyormusunuz?"
 
-#, java-format
-#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
+#~ msgid ""
+#~ "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them all?"
+#~ "The selection contains {0} ways. Are you sure you want to simplify them "
+#~ "all?"
 #~ msgstr[0] "Seçin {0} kadar yol içeriri. Basitleştireceğinize emin misiniz?"
-
-#~ msgid "Are you sure?"
-#~ msgstr "Emin misiniz?"
 
 #~ msgid "Open images with AgPifoJ..."
@@ -33328,5 +33600,4 @@
 #~ msgstr "Metacarta Map Rectifier imaj id"
 
-#, java-format
 #~ msgid "rectifier id={0}"
 #~ msgstr "rectifier id={0}"
@@ -33342,6 +33613,6 @@
 
 #~ msgid ""
-#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
-#~ "these will then show up in the WMS menu.\n"
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
 #~ "\n"
 #~ "You can also do this manually in the Advanced Preferences, using the "
@@ -33358,6 +33629,6 @@
 #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
 #~ "only need to input the relevant 'id'.\n"
-#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in "
-#~ "this example,replacing 73 with your image id: \n"
+#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
+#~ "in this example,replacing 73 with your image id: \n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -33366,6 +33637,6 @@
 #~ "use."
 #~ msgstr ""
-#~ "WMS tercihler sekmesinden şu ayarları yapabilirsiniz. Veri ekle, sil, düzelt "
-#~ "gibi - menuler ekranında görünecektir.\n"
+#~ "WMS tercihler sekmesinden şu ayarları yapabilirsiniz. Veri ekle, sil, "
+#~ "düzelt gibi - menuler ekranında görünecektir.\n"
 #~ "\n"
 #~ "Aynı zamanda aşağıdaki şemayı kullanarak, ileri tercihler kısmındada "
@@ -33376,13 +33647,14 @@
 #~ "\n"
 #~ "Tam WMS link formatı örnek (landsat)\n"
-#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&style"
-#~ "s=&srs=EPSG:4326&format=image/jpeg\n"
+#~ "http://onearth.jpl.nasa.gov/wms.cgi?"
+#~ "request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/"
+#~ "jpeg\n"
 #~ "\n"
-#~ "Metacarta Map Rectifier için http://labs.metacarta.com/rectifier/ ,  sadece "
-#~ "gerekli 'id' ye ihtiyacınız var.\n"
+#~ "Metacarta Map Rectifier için http://labs.metacarta.com/rectifier/ ,  "
+#~ "sadece gerekli 'id' ye ihtiyacınız var.\n"
 #~ "Metacarta Map Rectifier menusunu eklemek için şu linki örnek olarak, 73 ü "
 #~ "sizin 'id' niz ile değiştirin:\n"
-#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73&srs=EPSG:4326&Service=WMS&V"
-#~ "ersion=1.1.0&Request=GetMap&\n"
+#~ "http://labs.metacarta.com/rectifier/wms.cgi?"
+#~ "id=73&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&\n"
 #~ "format=image/png"
 
@@ -33480,5 +33752,4 @@
 #~ msgstr "Para Değişim"
 
-#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "eklenti JOSM’un güncellemesini gerektiriyor: {0}."
@@ -33523,5 +33794,4 @@
 #~ msgstr "Sadece JOSM Online Yardım dosyalaları düzenlenebilir"
 
-#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Sayfa {0} yüklerken hata oluştu"
@@ -33534,6 +33804,6 @@
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still want "
-#~ "to merge them?"
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
 #~ msgstr ""
 #~ "Seçili noktaların farklı üyelikleri var. Ona rağmen birleştirmek istiyor "
@@ -33546,21 +33816,17 @@
 #~ msgstr "Sadece bir nokta seçili"
 
-#, java-format
 #~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr "Yardım sayfası yok. <A HREF=\"{0}\">English</A> olarak oluştur."
 
-#, java-format
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
 #~ msgstr ""
-#~ "Yardım sayfası yok. <A HREF=\"{0}\">English</A> ya da <A "
-#~ "HREF=\"{1}\">türkçe</A> olarak oluştur."
-
-#, java-format
+#~ "Yardım sayfası yok. <A HREF=\"{0}\">English</A> ya da <A HREF=\"{1}"
+#~ "\">türkçe</A> olarak oluştur."
+
 #~ msgid "Parameter ''{0}'' must not be null."
 #~ msgstr "parametre ''{0}'' zero (null) olamaz"
 
-#, java-format
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Okunamadı \"{0}\""
@@ -33569,5 +33835,4 @@
 #~ msgstr "Seçimi Güncelle"
 
-#, java-format
 #~ msgid "Id > 0 required, got {0}"
 #~ msgstr "Id > 0 gerekiyordu, {0} elde edildi"
Index: /applications/editors/josm/i18n/po/uk.po
===================================================================
--- /applications/editors/josm/i18n/po/uk.po	(revision 21970)
+++ /applications/editors/josm/i18n/po/uk.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-14 20:35+0000\n"
+"POT-Creation-Date: 2010-06-23 22:47+0200\n"
+"PO-Revision-Date: 2010-06-23 19:18+0000\n"
 "Last-Translator: andygol <Unknown>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -15,7 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-06-15 16:21+0000\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Launchpad-Export-Date: 2010-06-23 20:27+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
@@ -102,6 +102,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:470
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
-msgstr ""
-"Параметр \"downloadgps\" не приймає імена файлів або URL-адреси файлів"
+msgstr "Параметр \"downloadgps\" не приймає імена файлів або URL-адреси файлів"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:538
@@ -256,5 +255,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
@@ -277,5 +276,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
@@ -283,6 +282,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
@@ -291,4 +292,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
@@ -328,9 +331,9 @@
 #, java-format
 msgid ""
-"<html>There are no layers the source layer<br>''{0}''<br>could be merged "
-"to.</html>"
-msgstr ""
-"<html>Шари, з якими можна об’єднати первісний "
-"шар<br>''{0}''<br>відсутні.</html>"
+"<html>There are no layers the source layer<br>''{0}''<br>could be merged to."
+"</html>"
+msgstr ""
+"<html>Шари, з якими можна об’єднати первісний шар<br>''{0}''<br>відсутні.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:81
@@ -353,9 +356,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
@@ -415,4 +418,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
@@ -452,5 +456,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 "Інформація"
@@ -607,6 +611,5 @@
 "Could not combine ways (They could not be merged into a single string of "
 "nodes)"
-msgstr ""
-"Не вдалося з’єднати лінії (Неможливо створити єдиний ланцюг з вузлів)"
+msgstr "Не вдалося з’єднати лінії (Неможливо створити єдиний ланцюг з вузлів)"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
@@ -662,5 +665,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
@@ -675,5 +678,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 "Вилучити"
@@ -925,4 +928,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 ""
@@ -934,4 +938,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 "Це може призвести до випадкового вилучення точок."
@@ -1075,6 +1080,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
-msgstr ""
-"Неможливо розібрати широту, довготу чи масштаб. Будь ласка, перевірте."
+msgstr "Неможливо розібрати широту, довготу чи масштаб. Будь ласка, перевірте."
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116
@@ -1244,6 +1248,6 @@
 msgid "<html>Cannot open directory ''{0}''.<br>Please select a file.</html>"
 msgstr ""
-"<html>Неможливо відкрити каталог ''{0}''.<br>Будь ласка, виберіть "
-"файл.</html>"
+"<html>Неможливо відкрити каталог ''{0}''.<br>Будь ласка, виберіть файл.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:190
@@ -1313,6 +1317,6 @@
 "точки. Тоді напрямок буде змінено згідно до цих опорних точок. (Пізніше, ви "
 "можете відмінити переміщення певних точок:<br>Виберіть їх та натисніть "
-"комбінацію клавіш для дій \"Зробити прямі кути / Відмінити\". Типово це "
-"Shift+Q.)"
+"комбінацію клавіш для дій \"Зробити прямі кути / Відмінити\". Типово це Shift"
+"+Q.)"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45
@@ -1362,6 +1366,6 @@
 "<html>Ви використовуєте проекцію EPSG:4326, що може призвести<br>до "
 "небажаних результатів при позиціонуванні прямокутних форм.<br>Змініть "
-"проекцію щоб позбутись цього попередження.<br>Чи бажаєте ви "
-"продовжити?</html>"
+"проекцію щоб позбутись цього попередження.<br>Чи бажаєте ви продовжити?</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:148
@@ -1392,6 +1396,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:417
 msgid "Please select ways with angles of approximately 90 or 180 degrees."
-msgstr ""
-"Будь ласка, виберіть ліній з кутами, близькими до 90 або 180 градусів."
+msgstr "Будь ласка, виберіть ліній з кутами, близькими до 90 або 180 градусів."
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
@@ -1518,6 +1521,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
@@ -1544,4 +1547,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
@@ -1550,6 +1555,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 "Помилка"
@@ -1665,6 +1670,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 ""
 "Показує звіт про стан, що містить корисну інформацію, яку можна прикріпити "
@@ -1702,8 +1706,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 "Вилучити точки за межами завантажених з сервера даних"
@@ -1712,5 +1718,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 "Ні, скасувати"
@@ -1718,16 +1725,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 "Виберіть хоча б одну лінію для спрощення."
@@ -1736,13 +1748,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 ""
@@ -1753,8 +1768,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"
@@ -1765,4 +1782,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)"
@@ -1839,6 +1857,6 @@
 msgstr ""
 "<html>Роль, заснована на участі у зв’язках, була скопійована у всі нові "
-"лінії.<br>Результат необхідно перевірити і виправити, якщо буде "
-"потрібно.</html>"
+"лінії.<br>Результат необхідно перевірити і виправити, якщо буде потрібно.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
@@ -1908,6 +1926,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 ""
 "* Одна точка, що використовується декількома лініям та одною з цих ліній, або"
@@ -1982,9 +1999,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)"
@@ -2001,5 +2018,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
@@ -2061,11 +2078,10 @@
 "''{0}''.<br>You have to resolve them first.</html>"
 msgstr ""
-"<html>Дані, що надсилаються, мають нерозв’язані конфлікти у шарі "
-"''{0}''.<br>Спочатку розв’яжіть конфлікти.</html>"
+"<html>Дані, що надсилаються, мають нерозв’язані конфлікти у шарі ''{0}''."
+"<br>Спочатку розв’яжіть конфлікти.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:153
 #: ../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 "Немає змін для надсилання."
@@ -2083,14 +2099,14 @@
 msgstr "Надіслати на сервер OSM всі зміни виділених об’єктів."
 
-#: ../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 "Читання батьків для \"{0}\""
 
-#: ../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 "Перевірка на вилучених батьків у локальному наборі даних"
@@ -2365,5 +2381,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
@@ -2487,6 +2503,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 ""
 "Перетягніть повзунок до треку для його програвання з відповідного місця; "
@@ -2578,7 +2594,7 @@
 "move zoom with right button"
 msgstr ""
-"Зміна масштабу коліщатком миші, чи Ctrl+. або Ctrl+,; пересування мапи — "
-"Ctrl+стрілки (вгору/вниз/праворуч/ліворуч) або перетягуйте за допомогою "
-"правої кнопки миші"
+"Зміна масштабу коліщатком миші, чи Ctrl+. або Ctrl+,; пересування мапи — Ctrl"
+"+стрілки (вгору/вниз/праворуч/ліворуч) або перетягуйте за допомогою правої "
+"кнопки миші"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48
@@ -2628,5 +2644,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."
@@ -2719,6 +2735,6 @@
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr ""
-"<b>type:</b>object_type, де object_type — <b>node</b>(точка), "
-"<b>way</b>(ліния), <b>relation</b>(зв’язок)"
+"<b>type:</b>object_type, де object_type — <b>node</b>(точка), <b>way</b>"
+"(ліния), <b>relation</b>(зв’язок)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
@@ -2753,6 +2769,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 ""
 "<b>nodes:</b>… — об’єкт із зазначеною кількістю точок (nodes:кількість або "
@@ -3043,10 +3059,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
@@ -3150,6 +3170,6 @@
 "conflict cannot be added.</html>"
 msgstr ""
-"<html>В шарі ''{0}'' вже присутній конфлікт для "
-"елемента<br>''{1}''.<br>Неможливо додати цей конфлікт.</html>"
+"<html>В шарі ''{0}'' вже присутній конфлікт для елемента<br>''{1}''."
+"<br>Неможливо додати цей конфлікт.</html>"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36
@@ -3173,5 +3193,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
@@ -3253,11 +3273,11 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231
 msgid ""
-"You are about to delete nodes outside of the area you have "
-"downloaded.<br>This can cause problems because other objects (that you do "
-"not see) might use them.<br>Do you really want to delete?"
-msgstr ""
-"Ви збираєтеся вилучити точки, що знаходяться за межами завантаженої "
-"ділянки.<br>Це може викликати проблеми, тому що інші об’єкти (яких не видно) "
-"можуть використовувати їх.<br> Чи дійсно ви бажаєте вилучити ці точки?"
+"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 ""
+"Ви збираєтеся вилучити точки, що знаходяться за межами завантаженої ділянки."
+"<br>Це може викликати проблеми, тому що інші об’єкти (яких не видно) можуть "
+"використовувати їх.<br> Чи дійсно ви бажаєте вилучити ці точки?"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
@@ -3306,11 +3326,11 @@
 msgstr[2] "Перемістити {0} точок"
 
-#: ../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 "Очищений об’єкт ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111
 #, java-format
 msgid "Purged {0} object"
@@ -3320,5 +3340,5 @@
 msgstr[2] "Очищено {0} об’єктів"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 #, java-format
 msgid ""
@@ -3329,5 +3349,5 @@
 "значення {1}"
 
-#: ../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}"
@@ -3551,6 +3571,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 ""
 "<html>Файл з налаштуваннями містить помилки.<br> Цей файл буде збережено як "
@@ -3645,5 +3665,5 @@
 #. *
 #. * the decimal format 999.999
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3652,5 +3672,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3659,5 +3679,5 @@
 #. *
 #. * coordinates East/North
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3692,6 +3712,5 @@
 msgid ""
 "Unable to add primitive {0} to the dataset because it is already included"
-msgstr ""
-"Неможливо додати елемент {0} до набору даних, так як він вже присутній"
+msgstr "Неможливо додати елемент {0} до набору даних, так як він вже присутній"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:656
@@ -3708,4 +3727,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}"
@@ -3717,33 +3739,24 @@
 msgstr "Відсутній результат об’єднання для об’єкта з ідентифікатором {0}"
 
-#: ../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 "Відсутній результат об’єднання для точки з ідентифікатором {0}"
 
-#: ../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 "Відсутній результат об’єднання для зв’язку з ідентифікатором {0}"
 
-#: ../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 "Відсутній результат об’єднання для типу {0} з ідентифікатором {1}"
-
-#. 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 ""
-"Отриманий об’єкт з ідентифікатором {0} та версією {1} видимий, хоча "
-"первинний об’єкт з нижчою версією {2} не видимий. Ця невідповідність "
-"неможлива. Отриманий об’єкт збережено. "
 
 #. translators notes must be in front
@@ -3821,19 +3834,19 @@
 msgstr "</p><p>Закрити діалог фільтра, щоб побачити всі об’єкти.<p></html>"
 
-#: ../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 "Елемент з ідентифікатором =0 не може бути видимий."
 
-#: ../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 "Очікується ідентифікатор >0. Маємо {0}."
 
-#: ../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 "Очікується версія >0. Маємо {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:795
 #, java-format
 msgid ""
@@ -3844,5 +3857,5 @@
 "{0}"
 
-#: ../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 "
@@ -3850,5 +3863,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 ""
@@ -3911,6 +3924,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 "Неможливо порівняти елементи з ідентифікаторами ''{0}'' та ''{1}''."
 
@@ -3925,5 +3937,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 "виділено"
@@ -4089,8 +4101,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
 #, java-format
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-"<html>Неможливо прочитати закладки з<br>''{0}''<br>Помилка: {1}</html>"
+msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr "<html>Неможливо прочитати закладки з<br>''{0}''<br>Помилка: {1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
@@ -4161,5 +4171,5 @@
 #. color tiger_data
 #. </rule>
-#. 
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4169,5 +4179,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4176,5 +4186,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4183,5 +4193,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4190,5 +4200,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4197,5 +4207,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4204,9 +4214,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--annotation tags -->
-#. 
+#.
 #. <!--"work in progress" tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="building"/>
@@ -4215,5 +4225,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 "будівля"
@@ -4301,5 +4311,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
@@ -4323,6 +4333,5 @@
 #, java-format
 msgid "Expected non-empty value for parameter ''{0}'', got ''{1}''"
-msgstr ""
-"Очікувалось непорожнє значення для параметру ''{0}'', отримано ''{1}''"
+msgstr "Очікувалось непорожнє значення для параметру ''{0}'', отримано ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
@@ -4543,5 +4552,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
@@ -4550,4 +4559,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
@@ -4657,6 +4667,6 @@
 "this list with the mouse.<hr>"
 msgstr ""
-"Натисніть на середню клавішу ще раз, щоб активувати на наступний "
-"елемент.<br> Утримуйте CTRL, щоб вибрати мишею, безпосередньо зі списку.<hr>"
+"Натисніть на середню клавішу ще раз, щоб активувати на наступний елемент."
+"<br> Утримуйте CTRL, щоб вибрати мишею, безпосередньо зі списку.<hr>"
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
@@ -4715,6 +4725,6 @@
 "relations</strong>.</html>"
 msgstr ""
-"<html>Будь ласка, підтвердить вилучення <strong>1 об’єкта</strong> з "
-"<strong>{0} зв’язків</strong>.</html>"
+"<html>Будь ласка, підтвердить вилучення <strong>1 об’єкта</strong> з <strong>"
+"{0} зв’язків</strong>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156
@@ -4756,5 +4766,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
@@ -4795,11 +4805,11 @@
 "<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 ""
 "<html>Як альтернативу, ви можете ввести <strong>адресу квадрата</strong> для "
-"окремого квадрата у форматі <i>zoomlevel/x/y</i>, наприклад: "
-"<i>15/256/223</i>. Адреси квадратів в форматі <i>zoom,x,y</i> або "
-"<i>zoom;x;y</i> також вірні.</html>"
+"окремого квадрата у форматі <i>zoomlevel/x/y</i>, наприклад: <i>15/256/223</"
+"i>. Адреси квадратів в форматі <i>zoom,x,y</i> або <i>zoom;x;y</i> також "
+"вірні.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
@@ -4830,5 +4840,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"
@@ -4837,5 +4847,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"
@@ -4844,5 +4854,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"
@@ -5046,6 +5056,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:454
 msgid "Copy my selected elements to the end of the list of merged elements."
-msgstr ""
-"Копіювати мої виділені елементи в кінець списку об’єднаних елементів."
+msgstr "Копіювати мої виділені елементи в кінець списку об’єднаних елементів."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:481
@@ -5072,6 +5081,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 ""
 "Скопіювати чужі виділені елементи в кінець списку об’єднаних елементів."
@@ -5156,6 +5164,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their "
-"entries.</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 "<html>Натисніть<strong>{0}</strong>, щоб почати об’єднання моїх записів з "
@@ -5165,6 +5173,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their "
-"entries.</html>"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
+"html>"
 msgstr ""
 "<html>Натисніть<strong>{0}</strong>, щоб закінчити об’єднання моїх записів з "
@@ -5224,6 +5232,6 @@
 #, java-format
 msgid ""
-"<html>An error occurred while communicating with the server<br>Details: "
-"{0}</html>"
+"<html>An error occurred while communicating with the server<br>Details: {0}</"
+"html>"
 msgstr ""
 "<html>Під час з’єднання з сервером виникла помилка<br>Подробиці: {0}</html>"
@@ -5464,10 +5472,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"
@@ -5476,10 +5486,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
@@ -5562,4 +5574,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 "нічого"
@@ -5730,6 +5743,6 @@
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
 msgstr ""
-"<html>Введіть значення теґу, наприклад: <strong><tt>перевірте "
-"членів</tt></strong></html>"
+"<html>Введіть значення теґу, наприклад: <strong><tt>перевірте членів</tt></"
+"strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
@@ -5744,8 +5757,7 @@
 "<html>Лінії, що об’єднуються є членами одного або декількох зв’язків. "
 "Виберіть, <strong>залишити</strong> лінію членом цих зв’язків або "
-"<strong>вилучити</strong> її.<br>Типово у зв’язку "
-"<strong>залишається</strong> перша та <strong>вилучаються</strong> інші "
-"лінії — члени одного й того же зв’язку: нова лінія займає в зв’язку місце "
-"оригінальної лінії.</html>"
+"<strong>вилучити</strong> її.<br>Типово у зв’язку <strong>залишається</"
+"strong> перша та <strong>вилучаються</strong> інші лінії — члени одного й "
+"того же зв’язку: нова лінія займає в зв’язку місце оригінальної лінії.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
@@ -5760,8 +5772,7 @@
 "<html>Точки, що об’єднуються є членами одного або декількох зв’язків. "
 "Виберіть, <strong>залишити</strong> точку членом цих зв’язків або "
-"<strong>вилучити</strong> її.<br>Типово у зв’язку "
-"<strong>залишається</strong> перша та <strong>вилучаються</strong> інші "
-"точки — члени одного й того же зв’язку: нова точка займає в зв’язку місце "
-"оригінальної точки.</html>"
+"<strong>вилучити</strong> її.<br>Типово у зв’язку <strong>залишається</"
+"strong> перша та <strong>вилучаються</strong> інші точки — члени одного й "
+"того же зв’язку: нова точка займає в зв’язку місце оригінальної точки.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
@@ -5796,7 +5807,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 ""
 "<html>Виберіть для показу набори правок тільки вибраних об’єктів.<br>Скиньте "
@@ -5823,6 +5834,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 "Завантажити дані про виділені набори змін з сервера OSM"
 
@@ -5868,5 +5878,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
@@ -5942,17 +5952,16 @@
 #, 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 ""
 "<html>Ви не закінчили злиття відмінностей у цьому конфлікті.<br>Розв’язання "
 "конфліктів не буде застосоване до тих пір, доки всі відмінності<br>не будуть "
 "опрацьовані.<br>Натисніть <strong>{0}</strong> щоб закрити у будь-якому "
-"випадку.<strong> Вже<br>опрацьовані відмінності не будуть "
-"застосовані.</strong><br>Натисніть <strong>{1}</strong>, щоб повернутись до "
-"розв’язання конфліктів.</html>"
+"випадку.<strong> Вже<br>опрацьовані відмінності не будуть застосовані.</"
+"strong><br>Натисніть <strong>{1}</strong>, щоб повернутись до розв’язання "
+"конфліктів.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
@@ -5974,5 +5983,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
@@ -5980,5 +5989,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 "Додати"
@@ -6027,5 +6036,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 "Історія"
@@ -6176,6 +6185,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373
 msgid "Create a copy of this relation and open it in another editor window"
-msgstr ""
-"Створити копію цього зв’язку і відкрити його в іншому вікні редактора"
+msgstr "Створити копію цього зв’язку і відкрити його в іншому вікні редактора"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:433
@@ -6246,10 +6254,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 "Вибрати зв’язок зі списку зв’язків"
@@ -6421,5 +6429,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:510
 msgid "My changesets"
-msgstr "Мій набори змін"
+msgstr "Мої набори змін"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:512
@@ -6446,5 +6454,5 @@
 msgctxt "changeset.state"
 msgid "Open"
-msgstr "Відкрити"
+msgstr "Відкритий"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:64
@@ -6553,6 +6561,6 @@
 "''{0}''.</html>"
 msgstr[0] ""
-"<html>Обраний об’єкт не доступний у поточному<br> редагованому шарі "
-"''{0}''.</html>"
+"<html>Обраний об’єкт не доступний у поточному<br> редагованому шарі ''{0}''."
+"</html>"
 msgstr[1] ""
 "<html>Жоден з виділених об’єктів не доступний у поточному<br>редагованому "
@@ -7555,6 +7563,5 @@
 msgid ""
 "Download the changeset with the specified id, including the changeset content"
-msgstr ""
-"Завантажити набір змін з вказаним номером, включаючи вміст набору змін"
+msgstr "Завантажити набір змін з вказаним номером, включаючи вміст набору змін"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:141
@@ -7746,9 +7753,9 @@
 #, 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>"
-msgstr ""
-"Будь ласка, введіть дату в звичайному форматі для вашої мови.<br>Приклад: "
-"{0}<br>Приклад: {1}<br>Приклад: {2}<br>Приклад: {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 ""
+"Будь ласка, введіть дату в звичайному форматі для вашої мови.<br>Приклад: {0}"
+"<br>Приклад: {1}<br>Приклад: {2}<br>Приклад: {3}<br>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1127
@@ -7758,6 +7765,6 @@
 "{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
 msgstr ""
-"Будь ласка, введіть час у вірному форматі для вашої мови.<br>Приклад: "
-"{0}<br>Приклад: {1}<br>Приклад: {2}<br>Приклад: {3}<br>"
+"Будь ласка, введіть час у вірному форматі для вашої мови.<br>Приклад: {0}"
+"<br>Приклад: {1}<br>Приклад: {2}<br>Приклад: {3}<br>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:108
@@ -7770,18 +7777,18 @@
 "include all changesets in the query.</html>"
 msgstr ""
-"<html>Позначте, щоб обмежитися запитом тільки до ваших наборів "
-"змін.<br>Зніміть позначку, щоб включити в запит всі набори змін.</html>"
+"<html>Позначте, щоб обмежитися запитом тільки до ваших наборів змін."
+"<br>Зніміть позначку, щоб включити в запит всі набори змін.</html>"
 
 #: ../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>"
-msgstr ""
-"<html>Будь ласка, виберіть один з наступних <strong>стандартних "
-"запитів</strong>. Позначте <strong>Завантажити тільки мої набори</strong>, "
-"якщо ви бажаєте завантажити тільки набори змін, створені вами. Зверніть "
-"увагу, що JOSM може завантажити не більше 100 наборів змін.</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 ""
+"<html>Будь ласка, виберіть один з наступних <strong>стандартних запитів</"
+"strong>. Позначте <strong>Завантажити тільки мої набори</strong>, якщо ви "
+"бажаєте завантажити тільки набори змін, створені вами. Зверніть увагу, що "
+"JOSM може завантажити не більше 100 наборів змін.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:147
@@ -7909,9 +7916,9 @@
 msgstr "Недійсний URL запиту отримання набору змін"
 
-#: ../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."
@@ -7921,23 +7928,23 @@
 msgstr[2] "Це змінить {0} об’єктів."
 
-#: ../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 "<інший>"
 
-#: ../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 "Змінити значення?"
 
-#: ../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"
@@ -7947,5 +7954,5 @@
 msgstr[2] "Зміна властивостей {0} об’єктів"
 
-#: ../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."
@@ -7955,77 +7962,77 @@
 msgstr[2] "Це змінить до {0} об’єктів."
 
-#: ../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 "Будь ласка, оберіть ключ"
 
-#: ../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 "Будь ласка, оберіть значення"
 
-#: ../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 "Параметри/Членство"
 
-#: ../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 "Параметри обраних об’єктів."
 
 #. 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 "Параметрів: {0} / Членів: {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 "Параметри / Члени"
 
-#: ../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 "Змінити зв’язок"
 
-#: ../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 "Справді стерти обране зі зв’язку {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 "Вилучити обраний ключ зі всіх об’єктів"
 
-#: ../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 "Додати нову пару ключ/значення до всіх об’єктів"
 
-#: ../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 "Правити значення обраного ключа для всіх об’єктів"
 
-#: ../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 "Вибрати зв’язок із основного виділення"
@@ -8147,9 +8154,9 @@
 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>"
-msgstr ""
-"<html>Існує принаймні один член цього зв’язку,<br>що посилається сам на "
-"себе.<br>Це створює циклічну залежність і не рекомендується.<br>Що робити із "
+"relation itself.<br>This creates circular dependencies and is discouraged."
+"<br>How do you want to proceed with circular dependencies?</html>"
+msgstr ""
+"<html>Існує принаймні один член цього зв’язку,<br>що посилається сам на себе."
+"<br>Це створює циклічну залежність і не рекомендується.<br>Що робити із "
 "циклічними залежностями?</html>"
 
@@ -8167,10 +8174,10 @@
 msgid ""
 "<html>This relation already has one or more members referring to<br>the "
-"primitive ''{0}''<br><br>Do you really want to add another relation "
-"member?</html>"
+"primitive ''{0}''<br><br>Do you really want to add another relation member?</"
+"html>"
 msgstr ""
 "<html>В цьому зв’язку вже є один чи декілька членів, що посилаються "
-"на<br>елемент ''{0}''<br><br>Ви дійсно хочете додати ще одного члена "
-"зв’язку?</html>"
+"на<br>елемент ''{0}''<br><br>Ви дійсно хочете додати ще одного члена зв’язку?"
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612
@@ -8186,6 +8193,6 @@
 msgstr ""
 "<html>Ви намагаєтесь додати зв’язок самого до себе.<br><br>Це створить "
-"циклічне посилання і тому не рекомендується.<br>Пропустити зв’язок "
-"''{0}''.</html>"
+"циклічне посилання і тому не рекомендується.<br>Пропустити зв’язок ''{0}''.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671
@@ -8343,7 +8350,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 ""
 "<html>Шар ''{0}'' має конфлікт для елементу<br>''{1}''.<br>Будь ласка "
@@ -8691,11 +8697,10 @@
 #, 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 ""
 "<html>Ні <strong>{0}</strong> ні <strong>{1}</strong> не можливо.<br>Будь "
-"ласка, виберіть чи завантажити дані OSM, чи дані GPX, або і перше і "
-"друге.</html>"
+"ласка, виберіть чи завантажити дані OSM, чи дані GPX, або і перше і друге.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
@@ -8835,14 +8840,14 @@
 "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 ""
 "<html><p class=\"warning-header\">Відсутній вміст розділу довідки</p><p "
-"class=\"warning-body\">Вміст довідки для розділу довідки "
-"<strong>{0}</strong> ще не написано. Варіант мовою ({1}) та англомовний "
-"варіанти поки відсутні.<br><br>Будь ласка, допоможіть покращити довідкову "
-"систему JOSM та додайте відсутню інформацію. Ви можете виправити розділ "
-"довідки, <a href=\"{2}\">вашою мовою ({1})</a> та — <a href=\"{3}\">розділ "
-"англійською</a>.</p></html>"
+"class=\"warning-body\">Вміст довідки для розділу довідки <strong>{0}</"
+"strong> ще не написано. Варіант мовою ({1}) та англомовний варіанти поки "
+"відсутні.<br><br>Будь ласка, допоможіть покращити довідкову систему JOSM та "
+"додайте відсутню інформацію. Ви можете виправити розділ довідки, <a href="
+"\"{2}\">вашою мовою ({1})</a> та — <a href=\"{3}\">розділ англійською</a>.</"
+"p></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
@@ -8851,11 +8856,11 @@
 "<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 ""
 "<html><p class=\"error-header\">Сталася помилка під час отримання довідкової "
 "інформації</p><p class=\"error-body\">Неможливо завантажити вміст довідкової "
-"статті <strong>{0}</strong>. Повідомлення про помилку (не "
-"перекладено):<br><tt>{1}</tt></p></html>"
+"статті <strong>{0}</strong>. Повідомлення про помилку (не перекладено):"
+"<br><tt>{1}</tt></p></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355
@@ -8958,6 +8963,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:272
 msgid "History not initialized yet. Failed to set reference primitive."
-msgstr ""
-"Історію ще не ініціалізовано. Не вдалося встановити посилання елемент."
+msgstr "Історію ще не ініціалізовано. Не вдалося встановити посилання елемент."
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:274
@@ -8974,11 +8978,9 @@
 msgid ""
 "Failed to set reference. Reference version {0} not available in history."
-msgstr ""
-"Не вдалося встановити посилання. номер версії {0} відсутній в історії."
+msgstr "Не вдалося встановити посилання. номер версії {0} відсутній в історії."
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302
 msgid "History not initialized yet. Failed to set current primitive."
-msgstr ""
-"Історію ще не ініціалізовано. Помилка налаштування поточного елемента."
+msgstr "Історію ще не ініціалізовано. Помилка налаштування поточного елемента."
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307
@@ -9053,6 +9055,6 @@
 "<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
 msgstr ""
-"<html>Версію <strong>{0}</strong> в поточний момент змінено в шарі "
-"''{1}''</html>"
+"<html>Версію <strong>{0}</strong> в поточний момент змінено в шарі ''{1}''</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:98
@@ -9147,9 +9149,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 ""
 "<html>Надсилання на сервер <strong>не вдалося<strong> так як на сервері є "
@@ -9157,8 +9158,8 @@
 "конфлікту є <strong>{0}</strong> з ід. <strong>{1}</strong>,<br>версія даних "
 "на сервері {2}, ваша версія {3}.<br><br>Натисніть <strong>{4}</strong>, щоб "
-"синхронізувати тільки конфліктний елемент.<br>Натисніть "
-"<strong>{5}</strong>, щоб синхронізувати весь локальний набір даних з "
-"сервером.<br>Натисніть <strong>{6}</strong>, щоб перервати надсилання та "
-"продовжити редагування.<br></html>"
+"синхронізувати тільки конфліктний елемент.<br>Натисніть <strong>{5}</"
+"strong>, щоб синхронізувати весь локальний набір даних з сервером."
+"<br>Натисніть <strong>{6}</strong>, щоб перервати надсилання та продовжити "
+"редагування.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
@@ -9172,14 +9173,13 @@
 msgid ""
 "<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click "
-"<strong>{0}</strong> to synchronize the entire local dataset with the "
-"server.<br>Click <strong>{1}</strong> to abort and continue "
-"editing.<br></html>"
+"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
+"</strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{1}</strong> to abort and continue editing.<br></html>"
 msgstr ""
 "<html><strong>Надсилання на сервер <strong>не вдалося<strong> так як на "
-"сервері є більш нова версія однієї<br>з ваших точок, ліній або "
-"зв’язку.<br><br>Натисніть <strong>{0}</strong> для синхронізації локальних "
-"даних з сервером. <br> Натисніть <strong>{1}</strong> щоб перервати "
-"надсилання та продовжити редагування..<br></html>"
+"сервері є більш нова версія однієї<br>з ваших точок, ліній або зв’язку."
+"<br><br>Натисніть <strong>{0}</strong> для синхронізації локальних даних з "
+"сервером. <br> Натисніть <strong>{1}</strong> щоб перервати надсилання та "
+"продовжити редагування..<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194
@@ -9220,6 +9220,6 @@
 msgstr ""
 "<html>Надсилання на сервер <strong>не вдалась</strong>, тому що ви "
-"намагались вилучити точку {0}, яка ще використовується в лінії "
-"{1}.<br><br>Натисніть <strong>{2}</strong>, щоб завантажити з сервера всі "
+"намагались вилучити точку {0}, яка ще використовується в лінії {1}."
+"<br><br>Натисніть <strong>{2}</strong>, щоб завантажити з сервера всі "
 "батьківські лінії точки {0}.<br>Якщо потрібно, JOSM створить конфлікти, які "
 "потім зможете врегулювати у вікні розв’язання конфліктів.</html>"
@@ -9311,6 +9311,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55
 msgid "<html>Please select the changesets you want to close</html>"
-msgstr ""
-"<html>Будь ласка, виберіть набори змін, які ви бажаєте закрити</html>"
+msgstr "<html>Будь ласка, виберіть набори змін, які ви бажаєте закрити</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88
@@ -9361,6 +9360,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237
 msgid "Please enter the user name of your OSM account"
-msgstr ""
-"Будь ласка, введіть ім’я користувача для вашого облікового запису OSM"
+msgstr "Будь ласка, введіть ім’я користувача для вашого облікового запису OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238
@@ -9454,5 +9452,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 "Ні"
@@ -9460,6 +9458,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 "В шарі ''{0}'' є зміни, які потрібно надіслати на сервер."
 
@@ -9556,6 +9553,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] ""
 "<html>{0} шар потрібно зберегти, але відсутній відповідний файл.<br>Або "
@@ -9576,6 +9573,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 "
@@ -9824,5 +9821,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9852,8 +9849,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:55
-msgid ""
-"The changeset is going to be <strong>closed</strong> after this upload"
-msgstr ""
-"Набір правок буде <strong>закритий</strong> після надсилання на сервер"
+msgid "The changeset is going to be <strong>closed</strong> after this upload"
+msgstr "Набір правок буде <strong>закритий</strong> після надсилання на сервер"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:57
@@ -9919,13 +9914,13 @@
 msgstr ""
 "{0} об’єкт(ів) перевищили макс. дозволену кількість ({1}) об’єктів в наборі "
-"змін на сервері ''{2}''. Будь ласка, <a href=\"urn:advanced-"
-"configuration\">укажіть</a> яким чином поводитись з <strong>кількома "
-"наборами змінне</strong>"
+"змін на сервері ''{2}''. Будь ласка, <a href=\"urn:advanced-configuration"
+"\">укажіть</a> яким чином поводитись з <strong>кількома наборами змінне</"
+"strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:101
 #, 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 ""
 "надсилання на сервер <strong>{0} об’єтів</strong> в <strong>кількох наборах "
@@ -9985,13 +9980,13 @@
 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 ""
 "Натисніть ''<strong>{0}</strong>'', щоб  продовжити надсилання на сервер у "
 "нові додаткові набори змін.<br>Натисніть ''<strong>{1}</strong>'', щоб "
-"повернутись до діалогу надсилання на сервер.<br>Натисніть "
-"''<strong>{2}</strong>'', щоб скасувати надсилання на сервер та повернутись "
-"до редагування мапи.<br>"
+"повернутись до діалогу надсилання на сервер.<br>Натисніть ''<strong>{2}</"
+"strong>'', щоб скасувати надсилання на сервер та повернутись до редагування "
+"мапи.<br>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:124
@@ -10000,5 +9995,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -10018,5 +10013,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..."
@@ -10028,6 +10023,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 ""
 "Ігнорування виявленого виключення, тому що надсилання на сервер скасовано. "
@@ -10266,7 +10260,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 ""
 "<html>Дані в шарі GPX ''{0}'' були завантажені з сервера.<br>Так як точки не "
@@ -10294,11 +10288,11 @@
 #, 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 ""
 "<html><html>Дані в шарі GPX ''{0}'' були завантажені з сервера.<br>Так як "
-"точки не містять міток часу, ми не можемо синхронізувати їх з "
-"зображеннями.</html>"
+"точки не містять міток часу, ми не можемо синхронізувати їх з зображеннями.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
@@ -10364,6 +10358,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 ""
 "<html>Надсилання на сервер необроблених даних GPS під виглядом даних мапи "
@@ -10430,6 +10424,6 @@
 "wish<br>to continue?</html>"
 msgstr ""
-"<html>Ця дія потребує {0} окремих<br>запитів на завантаження. "
-"Продовжити?</html>"
+"<html>Ця дія потребує {0} окремих<br>запитів на завантаження. Продовжити?</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
@@ -10566,10 +10560,10 @@
 #: ../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 ""
 "<html>Надсилання на сервер необроблених даних GPS під виглядом даних мапи "
-"вважається шкідливим.<br>Якщо хочете завантажити треки, ознайомтеся з "
-"цим:</html>"
+"вважається шкідливим.<br>Якщо хочете завантажити треки, ознайомтеся з цим:</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
@@ -10633,7 +10627,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 ""
 "<html>Зробіть фото вашого GPS приймача, коли він показує час.<br>Покажіть "
@@ -11250,6 +11244,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 ""
 "<html>Запустити автоматичну процедуру отримання мітки доступу з веб-сайту "
@@ -11281,8 +11275,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 ""
 "Будь ласка, введіть ваші ім’я користувача OSM і пароль.. Пароль <strong>не "
@@ -11396,7 +11390,7 @@
 "authorization process,<br>i.e. semi-automatic or manual authorization.</html>"
 msgstr ""
-"<html>Не вдалося автоматично отримати мітку доступу OAuth<br>з сервера "
-"OSM.<br><br>Будь ласка, спробуйте ще раз або виберіть інший процес "
-"авторизації,<br>наприклад, напівавтоматичний або авторизацію вручну.</html>"
+"<html>Не вдалося автоматично отримати мітку доступу OAuth<br>з сервера OSM."
+"<br><br>Будь ласка, спробуйте ще раз або виберіть інший процес авторизації,"
+"<br>наприклад, напівавтоматичний або авторизацію вручну.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:458
@@ -11423,6 +11417,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 ""
 "<html>Не вдалося автоматично отримати мітку доступу OAuth <br>з сервера OSM. "
@@ -11545,6 +11539,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 ""
 "Збій автентифікації користувача ''{0}'' з паролем «***», як користувача OAuth"
@@ -11623,6 +11616,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
 msgid "Select to grant JOSM the right to write your server preferences"
-msgstr ""
-"Виберіть, для надання JOSM прав на запис ваших налаштувань для сервера"
+msgstr "Виберіть, для надання JOSM прав на запис ваших налаштувань для сервера"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
@@ -11686,8 +11678,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 ""
 "<html>JOSM успішно отримав мітку запиту. JOSM тепер відкриє сторінку "
@@ -11715,6 +11707,6 @@
 msgstr ""
 "<html>JOSM успішно отримав мітку доступу. Ви можете прийняти її. JOSM буде "
-"використовувати його для автентифікації та авторизації на сервері "
-"OSM.<br><br>Мітка доступу: </html>"
+"використовувати його для автентифікації та авторизації на сервері OSM."
+"<br><br>Мітка доступу: </html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:348
@@ -11789,8 +11781,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 ""
 "<html>Мітка доступу ''{1}'' відома серверу OSM ''{0}''.<br>Однак, тест "
@@ -11828,11 +11820,11 @@
 #: ../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>"
-msgstr ""
-"<html>Тест не пройшов, тому що сервер повідомив про внутрішню "
-"помилку.<br>JOSM не зміг визначити достовірність мітки. Будь ласка,спробуйте "
-"пізніше.</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 ""
+"<html>Тест не пройшов, тому що сервер повідомив про внутрішню помилку."
+"<br>JOSM не зміг визначити достовірність мітки. Будь ласка,спробуйте пізніше."
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
@@ -11882,5 +11874,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 "Будь ласка, оберіть рядок для вилучення."
@@ -12083,6 +12075,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Dilution of Position (red = high, green = low, if available)"
-msgstr ""
-"Розведення Позицій (червоний = високо, зелений = низько, якщо такі є)"
+msgstr "Розведення Позицій (червоний = високо, зелений = низько, якщо такі є)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
@@ -12250,6 +12241,5 @@
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
-msgstr ""
-"Показувати лінії, навіть якщо немає імпортованої інформації про лінії."
+msgstr "Показувати лінії, навіть якщо немає імпортованої інформації про лінії."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
@@ -12259,6 +12249,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 ""
 "Показувати стрілки напрямку, використовуючи таблиці, замість математичних "
@@ -12303,6 +12292,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 msgid "Allows to tune the track coloring for different average speeds."
-msgstr ""
-"Дозволяє настроювати забарвлення треку для різних середніх швидкостей."
+msgstr "Дозволяє настроювати забарвлення треку для різних середніх швидкостей."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
@@ -12325,6 +12313,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 "Застосувати згладжування мапи."
 
@@ -12397,5 +12384,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 "Використовувати типові налаштування"
@@ -12415,13 +12402,10 @@
 #: ../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>:"
 msgstr[0] "Цей втулок було <strong>успішно</strong> завантажено з сервера:"
-msgstr[1] ""
-"Ці {0} втулки було <strong>успішно</strong> завантажено з сервера:"
-msgstr[2] ""
-"Ці {0} втулків було <strong>успішно</strong> завантажено з сервера:"
+msgstr[1] "Ці {0} втулки було <strong>успішно</strong> завантажено з сервера:"
+msgstr[2] "Ці {0} втулків було <strong>успішно</strong> завантажено з сервера:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
@@ -12547,6 +12531,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 ""
 "<p>Більш того, сполучення клавіші активізуються відразу, якщо вони "
@@ -12563,9 +12547,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 ""
 "<p>Ви можете помітити, що список вибраних клавіш на наступній сторінці, "
@@ -12575,10 +12559,10 @@
 "вашій клавіатурі немає клавіші''Copy'' (її немає на клавіатурі PC, але є на "
 "клавіатурі Sun), то не використовуйте її. Те ж саме стосується і до "
-"комбінацій клавішам, що відповідають вашій клавіатурі (наприклад: "
-"'':''/двокрапка). Будь ласка, не використовуйте їх, або використовуйте "
-"замість цього базові клавіші ('';''/крапка з комою на клавіатурах US, "
-"''.''/точка на клавіатурах German, і т.д.). Якщо ви не зробите так, можуть "
-"виникнути конфлікти, так як JOSM не розуміє, що Ctrl+Shift+; це теж  саме, "
-"що й Ctrl+: на клавіатурі US.</p>"
+"комбінацій клавішам, що відповідають вашій клавіатурі (наприклад: '':''/"
+"двокрапка). Будь ласка, не використовуйте їх, або використовуйте замість "
+"цього базові клавіші ('';''/крапка з комою на клавіатурах US, ''.''/точка на "
+"клавіатурах German, і т.д.). Якщо ви не зробите так, можуть виникнути "
+"конфлікти, так як JOSM не розуміє, що Ctrl+Shift+; це теж  саме, що й Ctrl+: "
+"на клавіатурі US.</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
@@ -12746,6 +12730,5 @@
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
-msgstr ""
-"Неможливо активувати проекцію {0}. Використовується проекція Меркатора"
+msgstr "Неможливо активувати проекцію {0}. Використовується проекція Меркатора"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
@@ -12880,9 +12863,9 @@
 #, java-format
 msgid ""
-"<html>Failed to load the list of style sources "
-"from<br>''{0}''.<br><br>Details (untranslated):<br>{1}</html>"
-msgstr ""
-"<html>Не вдалось завантажити список джерел стилів "
-"з<br>''{0}''.<br><br>Тонкощі (англ.):<br>{1}</html>"
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+"<html>Не вдалось завантажити список джерел стилів з<br>''{0}''."
+"<br><br>Тонкощі (англ.):<br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
@@ -12894,5 +12877,5 @@
 "Отримано ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #, java-format
 msgid ""
@@ -12904,15 +12887,15 @@
 
 #. 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 "Неможливо прочитати з джерела заготовок теґів {0}"
 
-#: ../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>"
+"really want to use it?<br><br><table width=600>Error is: [{1}:{2}] {3}</"
+"table></html>"
 msgstr ""
 "<html>Джерело заготовок теґів {0} можливо завантажити, але вони містять "
@@ -12920,5 +12903,5 @@
 "width=600>Помилки: [{1}:{2}] {3}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
 #, java-format
 msgid ""
@@ -12930,5 +12913,5 @@
 "{3}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
 #, java-format
 msgid ""
@@ -12936,6 +12919,9 @@
 "really want to use it?<br><br><table width=600>Error is: {1}</table></html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:101
+"<html>Джерело заготовок теґів {0} можливо завантажити, але вони містять "
+"помилки. Ви дійсно бажаєте скористатися ним?<br><br><table "
+"width=600>Помилка: {1}</table></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
 #, java-format
 msgid ""
@@ -12943,10 +12929,13 @@
 "it?<br><br><table width=600>Error is: {1}</table></html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:133
+"<html>Неможливо здійснити лексичний розбір джерела заготовок теґів: {0}. Ви "
+"дійсно бажаєте скористатися ним?<br><br><table width=600>Помилка: {1}</"
+"table></html>"
+
+#: ../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 "Заготовки теґів"
@@ -13063,6 +13052,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 ""
 "<html>Не вдалося побудувати URL ''{0}'' для оцінки сервера OSM API.<br>Будь "
@@ -13088,6 +13077,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 ""
 "<html>Не вдалось отримати список наборів змін з сервера OSM API <br>''{1}''. "
@@ -13184,6 +13173,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 ""
 "Попередження: Не вдалося отримати мітку доступу OAuth від менеджера "
@@ -13205,6 +13193,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 ""
 "Ви вже маєте мітку доступу для доступу до сервера OSM за допомогою OAuth."
@@ -13237,6 +13224,5 @@
 #, java-format
 msgid "<html>Use the default OSM server URL (<strong>{0}</strong>)</html>"
-msgstr ""
-"<html>Використовувати типовий сервер OSM (<strong>{0}</strong>)</html>"
+msgstr "<html>Використовувати типовий сервер OSM (<strong>{0}</strong>)</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:88
@@ -13262,6 +13248,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:235
 msgid "OSM API URL must not be empty. Please enter the OSM API URL."
-msgstr ""
-"URL OSM API не повинно бути порожнім. Будь ласка, введіть URL OSM API."
+msgstr "URL OSM API не повинно бути порожнім. Будь ласка, введіть URL OSM API."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:239
@@ -13305,6 +13290,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 ""
 "Використовувати стандартні системні налаштування (заблоковано. Запустіть "
@@ -13445,4 +13430,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 "Змінити параметри"
@@ -13555,6 +13541,5 @@
 #, java-format
 msgid "Unexpected value for ''{0}'' in changeset query url, got {1}"
-msgstr ""
-"Неочікуване значення для ''{0}'' в URL запиті набору правок, маємо {1}"
+msgstr "Неочікуване значення для ''{0}'' в URL запиті набору правок, маємо {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:362
@@ -13627,11 +13612,10 @@
 #. 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
 msgid ""
 "Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
-msgstr ""
-"Помилка: підключення до ''{0}'' з URI ''{1}'' не вдалося. Помилка: {2}"
+msgstr "Помилка: підключення до ''{0}'' з URI ''{1}'' не вдалося. Помилка: {2}"
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
@@ -13649,5 +13633,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}''"
@@ -13818,6 +13802,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 ""
 "Елемент з ідентифікатором {0} відсутній у локальній базі даних. Не можу "
@@ -13941,11 +13924,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 ""
-"Сервер повернув неочікуваний формат ідентифікатора. Отримано ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:278
+msgstr "Сервер повернув неочікуваний формат ідентифікатора. Отримано ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -13955,64 +13937,64 @@
 "''{1}''."
 
-#: ../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 "Набір змін {0} успішно відкрито"
 
-#: ../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 "Очікується ідентифікатор набору змін > 0. Отримано {0}."
 
-#: ../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 "Оновлення набору змін {0}…"
 
-#: ../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 "Очікування 10 секунд… "
 
-#: ../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 "Спроба {0} з {1} через {2} секунди…"
 
-#: ../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 "Спроба {0} з {1}."
 
-#: ../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}."
@@ -14020,5 +14002,5 @@
 "Треба, щоб ідентифікатор поточного набору змін був > 0. Поточний Ід.: {0}."
 
-#: ../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}."
@@ -14221,4 +14203,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})"
@@ -14238,6 +14221,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 ""
 "<html>Сталася помилка під час відновлення резервної копії файлу.<br>Помилка: "
@@ -14267,6 +14250,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 ""
 "Відсутні обов’язкові атрибути елементу ''bounds''. Отримано minlon=''{0}'', "
@@ -14311,6 +14294,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 ""
 "Неприпустиме значення атрибуту ''ref'' у члена зв’язку {0}. Отримано {1}"
@@ -14652,5 +14634,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:112
 msgid "Download skipped"
-msgstr ""
+msgstr "Завантаження пропущено"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:118
@@ -14781,12 +14763,11 @@
 msgstr[0] "Втулок {0} потребує втулок, який не знайдено. Відсутній втулок:"
 msgstr[1] "Втулок {0} потребує {1} втулки, які не знайдено. Відсутні втулки:"
-msgstr[2] ""
-"Втулок {0} потребує {1} втулків, які не знайдено. Відсутні втулки:"
+msgstr[2] "Втулок {0} потребує {1} втулків, які не знайдено. Відсутні втулки:"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 #, 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 ""
 "<html>Втулок {0} вимагає JOSM версії {1}. Поточна версія JOSM — {2}.<br>Вам "
@@ -14995,6 +14976,5 @@
 #, java-format
 msgid "Failed to create plugin information from manifest for plugin ''{0}''"
-msgstr ""
-"Не можливо створити інформацію про втулок з manifest’у втулка ''{0}''"
+msgstr "Не можливо створити інформацію про втулок з manifest’у втулка ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:41
@@ -15017,6 +14997,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 ""
 "Попередження: Не вдалося сканування файлу ''{0}'' для отримання інформації "
@@ -15025,5 +15004,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:109
 msgid "Processing plugin site cache icon files..."
-msgstr ""
+msgstr "Обробка файлів значків з кешу сайта втулка…"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:133
@@ -15089,5 +15068,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"
@@ -15171,7 +15150,7 @@
 msgstr ""
 "<html>Не вдалось автентифікувати сервер OSM ''{0}''.<br>Ви використовуєте "
-"автентифікацію OAuth, але зараз немає<br>налаштованої мітки доступу "
-"OAuth.<br>Будь ласка, відкрийте діалог налаштувань та згенеруйте або введіть "
-"мітку доступу.</html>"
+"автентифікацію OAuth, але зараз немає<br>налаштованої мітки доступу OAuth."
+"<br>Будь ласка, відкрийте діалог налаштувань та згенеруйте або введіть мітку "
+"доступу.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:78
@@ -15184,6 +15163,6 @@
 "<html><strong>Не вдалось</strong> вилучити <strong>зв’язок {0}</strong>. Він "
 "все ще посилається на зв’язок {1}.<br>Будь ласка, завантажте зв’язок {1}, "
-"вилучіть посилання на зв’язок {0}, після чого знов наділіть дані на "
-"сервер.</html>"
+"вилучіть посилання на зв’язок {0}, після чого знов наділіть дані на сервер.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:105
@@ -15191,28 +15170,27 @@
 msgid ""
 "<html>Uploading to the server <strong>failed</strong> because your "
-"current<br>dataset violates a precondition.<br>The error message "
-"is:<br>{0}</html>"
+"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
+"html>"
 msgstr ""
 "<html>Надсилання даних на сервер <strong>не вдалось</strong>, так як ваші "
-"дані<br> порушують обов’язкові умови.<br> Повідомлення про "
-"помилку:<br>{0}</html>"
+"дані<br> порушують обов’язкові умови.<br> Повідомлення про помилку:<br>{0}</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:113
 #, 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>"
-msgstr ""
-"<html>Автентифікація на сервері OSM користувача з ім’ям ''{0}'' не "
-"вдалась.<br>Перевірте ім’я користувача та пароль в налаштуваннях JOSM. "
-"</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 ""
+"<html>Автентифікація на сервері OSM користувача з ім’ям ''{0}'' не вдалась."
+"<br>Перевірте ім’я користувача та пароль в налаштуваннях JOSM. </html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
 #, 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 ""
 "<html>Автентифікація на сервері OSM користувача з міткою OAuth ''{0}'' не "
@@ -15223,13 +15201,12 @@
 #, 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>"
-msgstr ""
-"<html>Авторизація на сервері OSM за допомогою мітки OAuth ''{0}'' не "
-"вдалась.<br>Ця мітка не надає доступ до захищених "
-"ресурсів<br>''{1}''.<br>Будь ласка, запустіть діалог налаштувань та "
-"отримайте іншу мітку OAuth</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 ""
+"<html>Авторизація на сервері OSM за допомогою мітки OAuth ''{0}'' не вдалась."
+"<br>Ця мітка не надає доступ до захищених ресурсів<br>''{1}''.<br>Будь "
+"ласка, запустіть діалог налаштувань та отримайте іншу мітку OAuth</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
@@ -15250,7 +15227,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 ""
 "<html>Збій з’єднання з сервером OSM ''{0}''. Відповідь сервера<br>містить "
@@ -15315,7 +15292,6 @@
 "check your internet connection.</html>"
 msgstr ""
-"<html>Не вдалося встановити з’єднання з віддаленим "
-"сервером<br>''{0}''.<br>Будь ласка, перевірте підключення до "
-"Інтернету.</html>"
+"<html>Не вдалося встановити з’єднання з віддаленим сервером<br>''{0}''."
+"<br>Будь ласка, перевірте підключення до Інтернету.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:321
@@ -15340,7 +15316,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 ""
 "<html>Сервер OSM<br>''{0}''<br>повідомив про внутрішню помилку.<br>Швидше за "
@@ -15354,7 +15329,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 ""
 "Ділянка, яку ви намагалися завантажити є занадто великою або ваш запит був "
@@ -15387,8 +15362,7 @@
 "preferences and your internet connection.</html>"
 msgstr ""
-"<html>Не вдалося встановити з’єднання з віддаленим "
-"сервером<br>''{0}''.<br>Ім’я хосту ''{1}'' не знайдено. <br>Будь ласка, "
-"перевірте посилання до API в ваших налаштуваннях і підключення до "
-"Інтернету.</html>"
+"<html>Не вдалося встановити з’єднання з віддаленим сервером<br>''{0}''."
+"<br>Ім’я хосту ''{1}'' не знайдено. <br>Будь ласка, перевірте посилання до "
+"API в ваших налаштуваннях і підключення до Інтернету.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:487
@@ -15397,6 +15371,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 ""
 "<html>Сервер повідомляє, що об’єкт вилучено.<br><strong>Надсилання не "
@@ -15867,4 +15841,6 @@
 "around a chosen pivot."
 msgstr ""
+"Робить пару виділених відрізків лінії паралельними, обертаючи один з них "
+"навколо обраного центру."
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:38
@@ -15924,4 +15900,7 @@
 "Please choose a different segment to be aligned."
 msgstr ""
+"Відрізок, положення якого треба впорядкувати, не може бути таким же як "
+"зразковий відрізок.\n"
+"Будь ласка, оберіть інший відрізок для впорядкування положення."
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:109
@@ -15930,4 +15909,7 @@
 "Please choose a different reference segment."
 msgstr ""
+"Зразковий відрізок не може бути таким же, як відрізок, положення якого треба "
+"впорядкувати.\n"
+"Будь ласка, виберіть інший відрізок для зразка."
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:54
@@ -15941,6 +15923,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>"
@@ -15971,4 +15953,14 @@
 "\n"
 msgstr ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays допоможе\n"
+"вам вирівняти два відрізки лінії. Це буває зручно, коли\n"
+"ви окреслюєте будівлю і бажаєте, щоб її стіни були паралельні до\n"
+"вулиці або дороги.\n"
+"<br>\n"
+"<br>Деякі поради стануть вам в нагоді:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 
 #. NOI18N
@@ -15978,6 +15970,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"
@@ -15987,4 +15979,15 @@
 "\n"
 msgstr ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Виділіть зразковий відрізок.</b> Зробіть це за допомогою <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>.\n"
+"Інший відрізок, положення якого треба впорядкувати, стане паралельним до "
+"цього відрізку.</li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 
 #. NOI18N
@@ -16005,4 +16008,16 @@
 "\n"
 msgstr ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Виділіть відрізок, положення якого потрібно впорядкувати.</b> "
+"Зробіть це, <b><i><span style=\"color:green\">клацнувши</span></i></b> на "
+"нього. \n"
+"Центр оберту буде підсвічений, типово, по середині відрізку.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 
 #. NOI18N
@@ -16015,6 +16030,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"
@@ -16023,14 +16038,26 @@
 "\n"
 msgstr ""
-
-#. NOI18N
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:98
-msgid ""
 "<html>\n"
 "<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>змініть центр оберту</b>. Щоби стати паралельно зі "
+"зразковим відрізком, впорядковуємий відрізок обертається навкруг центру "
+"оберту. Ви можете назначити центром оберту один з кінців або середину "
+"відрізку, <b><i><span style=\"color:green\">клацнувши</span></i></b>поруч. \n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
+
+#. NOI18N
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:98
+msgid ""
+"<html>\n"
+"<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"
 " menu or may want to place the action on the <b>toolbar</b>.\n"
 "  </li>\n"
@@ -16040,4 +16067,16 @@
 "\n"
 msgstr ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Впорядкування відрізків.</b> Натисніть <b><i><span style=\"color:"
+"green\">Shift-A</span></i></b>. Також ви можете знайти команду в меню "
+"<b>Інструменти</b>\n"
+" або можете призначити назначить дію на <b>панель інструментів</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
@@ -16052,4 +16091,12 @@
 "\n"
 msgstr ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> Є спосіб, виділити заново будь-що, у разі потреби: "
+"використовуйте для цього <b><i><span style=\"color:green\">Alt-Click</span></"
+"i></b>.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
@@ -16081,9 +16128,29 @@
 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 "Встановити розмір будівель"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#, fuzzy
+msgid "Rotate crosshair"
+msgstr "Повернути вправо"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#, fuzzy
+msgid "Advanced settings"
+msgstr "Налаштування додаткових параметрів"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#, fuzzy
+msgid "Building tag:"
+msgstr "Будівля"
+
+#: ../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"
@@ -16092,35 +16159,48 @@
 #: ../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 "Створити будівлю"
+
+#: ../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
+#, fuzzy
+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"
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:379
+#, fuzzy
+msgid "Point on the corner of the building to start drawing"
+msgstr "Клацніть на кут будівля для початку креслення"
+
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:381
+#, fuzzy
+msgid "Point on opposite end of the building"
 msgstr "Вкажіть протилежний кінець будівлі"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
-msgid "Set width of building"
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:383
+#, fuzzy
+msgid "Set width of the building"
 msgstr "Встановити ширину будівлі"
 
@@ -16311,7 +16391,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--waterway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -16321,5 +16401,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -16329,5 +16409,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -16343,5 +16423,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -16351,5 +16431,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -16357,8 +16437,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 "вода"
@@ -16380,5 +16460,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -16387,5 +16467,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -16394,5 +16474,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -16401,5 +16481,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -16408,5 +16488,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -16415,10 +16495,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 "адреса"
@@ -16447,19 +16527,17 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
-"A special handler of the French cadastre wms at "
-"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
-"(in French): <br><a "
-"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.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 ""
 "Спеціальний обробник WMS-шару французького кадастру з www.cadastre.gouv.fr "
 "<BR> <BR> Будь ласка, прочитайте умови використання тут (французською): <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> до надсилання на сервер будь-яких даних, створених за допомогою цього "
-"втулка."
+"<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> до надсилання на сервер будь-"
+"яких даних, створених за допомогою цього втулка."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98
@@ -16917,6 +16995,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 "Порожній шар"
@@ -17103,4 +17181,52 @@
 msgstr "Не знайдено шару даних GPX"
 
+#: ../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 "Властивості Зоопарку"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#, fuzzy
+msgid "Name:"
+msgstr "Назва"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#, fuzzy
+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
+#, fuzzy, java-format
+msgid "Delete tool \"{0}\"?"
+msgstr "Вилучити точку {0}"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:74
+msgid "Are you sure?"
+msgstr ""
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
+#, fuzzy
+msgid "New tool..."
+msgstr "Нова роль"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
+#, fuzzy
+msgid "Install"
+msgstr "Промзона"
+
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
 msgid "Position only"
@@ -17223,6 +17349,6 @@
 msgstr ""
 "Не вдається завантажити бібліотеку rxtxSerial.Якщо вам потрібна консультація "
-"зі встановлення, завітайте до Домівки Globalsat за адресою "
-"http://www.raphael-mack.de/josm-globalsat-gpx-import-plugin/"
+"зі встановлення, завітайте до Домівки Globalsat за адресою http://www."
+"raphael-mack.de/josm-globalsat-gpx-import-plugin/"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
@@ -17370,5 +17496,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#. 
+#.
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -17489,6 +17615,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 ""
 "Максимальна кількість відрізків у створюваних лініях. Початкове значення — "
@@ -17513,7 +17638,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 ""
 "Точність апроксимації Дугласа-П’юкера для спрощення ліній, вимірювана в "
@@ -17839,6 +17963,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 ""
 "Заголовок містить кілька значень і не може бути представлений  одним рядком"
@@ -17953,6 +18076,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 ""
 "У вас є не збережені зміни у вашій черзі. Ви хочете відправити їх зараз?"
@@ -18006,6 +18128,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 ""
 "Записати інформацію про місце знаходження в exif-розділ наступних файлів:"
@@ -18346,6 +18467,5 @@
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
 msgid "Remote Control has been asked to create a new node."
-msgstr ""
-"Втулок віддаленого управління отримав запит на створення нової точки."
+msgstr "Втулок віддаленого управління отримав запит на створення нової точки."
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
@@ -18357,13 +18477,13 @@
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
 msgid "Revert changeset fully"
-msgstr ""
+msgstr "Повністю повернути набір змін"
 
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert selection only"
-msgstr ""
+msgstr "Повернути тільки виділене"
 
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
 msgid "Revert selection and restore deleted objects"
-msgstr ""
+msgstr "Повернути виділені та відновити вилучені об’єкти"
 
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
@@ -18377,13 +18497,13 @@
 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}"
-msgstr ""
+msgstr "Відсутній об’єкт злиття для {0} з ідентифікатором {1}"
 
 #: ../plugins/reverter/src/reverter/DataSetToCmd.java:51
 #, java-format
 msgid "Target of type {0} with id {1} has invalid version"
-msgstr ""
+msgstr "Об’єкт типу {0} з ідентифікатором {1} має неправильну версію"
 
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15
@@ -18409,4 +18529,7 @@
 "It is needed to download them before reverting. Do you want to continue?"
 msgstr ""
+"Цей набір змін має об’єкти, які не представлені в поточному наборі даних.\n"
+"Їх потрібно завантажити до того як відмінити набір правок. Ви бажаєте "
+"продовжити?"
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:60
@@ -18416,9 +18539,9 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:64
 msgid "Fetching missing primitives"
-msgstr ""
+msgstr "Отримання відсутніх елементів"
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:75
 msgid "Downloading changeset"
-msgstr ""
+msgstr "Завантаження набору змін"
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:98
@@ -18426,4 +18549,41 @@
 msgid "Revert changeset #{0}"
 msgstr "Повернути набір змін #{0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:78
+#, fuzzy
+msgid "Road Sign Plugin"
+msgstr "Завантаження втулків"
+
+#: ../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 "Неможливо прочитати з джерела заготовок теґів: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
+#, fuzzy, java-format
+msgid "Error parsing tagging preset from ''{0}'':\n"
+msgstr "Розбір списку втулків з сайту ''{0}''"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:104
+#, fuzzy, java-format
+msgid "Sign {0}"
+msgstr "Вибір: {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:111
+#, fuzzy, java-format
+msgid "Additional sign {0}"
+msgstr "Додати зв’язок {0}"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -18530,4 +18690,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 "Спростити лінію"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
+#, fuzzy
+msgid "Delete unnecessary nodes from an area."
+msgstr "Вилучити з лінії непотрібні точки"
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
 msgid "Slippy Map"
@@ -18939,6 +19110,6 @@
 "OSM relation representing this turn restriction."
 msgstr ""
-"В наступній таблиці ви можете редагувати <strong>необроблених "
-"членів</strong> зв’язків OSM, що встановлюють обмеження на поворот."
+"В наступній таблиці ви можете редагувати <strong>необроблених членів</"
+"strong> зв’язків OSM, що встановлюють обмеження на поворот."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
@@ -19007,6 +19178,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:142
 msgid "Show errors and warnings related to this turn restriction"
-msgstr ""
-"Показати помилки та попередження, пов’язані з цим обмеження на поворот"
+msgstr "Показати помилки та попередження, пов’язані з цим обмеження на поворот"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:280
@@ -19374,9 +19544,9 @@
 #: ../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>."
-msgstr ""
-"Спонсором створення цього втулку була компанія <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 ""
+"Спонсором створення цього втулку була компанія <a href=\"http://www.skobbler."
+"de\">skobbler GmbH</a>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:96
@@ -19471,13 +19641,13 @@
 #, 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."
-msgstr ""
-"Це обмеження на поворот використовує лінію OSM <span class=\"object-"
-"name\">{0}</span> з роллю <tt>з (from)</tt> <strong>та</strong> з роллю "
-"<tt>до (to)</tt>. В обмеженні на поворот, лінія з роллю <tt>з (from)</tt> "
-"повинна хоча б відрізнятись від лінії з роллю <tt>до (to)</tt>."
+"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 ""
+"Це обмеження на поворот використовує лінію OSM <span class=\"object-name\">"
+"{0}</span> з роллю <tt>з (from)</tt> <strong>та</strong> з роллю <tt>до (to)"
+"</tt>. В обмеженні на поворот, лінія з роллю <tt>з (from)</tt> повинна хоча "
+"б відрізнятись від лінії з роллю <tt>до (to)</tt>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:37
@@ -19536,15 +19706,15 @@
 "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 ""
 "Лінія <strong>З</strong> <span class=\"object-name\">{0}</span> та лінія "
 "<strong>До</strong> <span class=\"object-name\">{1}</span> перетинаються у "
-"точці <span class=\"object-name\">{2}</span> але <span class=\"object-"
-"name\">{2}</span> не є елементом <strong>через</strong>.<br> Рекомендується "
-"задати <span class=\"object-name\">{2}</span>, як унікальний елемент "
-"<strong>через</strong>."
+"точці <span class=\"object-name\">{2}</span> але <span class=\"object-name\">"
+"{2}</span> не є елементом <strong>через</strong>.<br> Рекомендується задати "
+"<span class=\"object-name\">{2}</span>, як унікальний елемент <strong>через</"
+"strong>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:49
@@ -19670,18 +19840,18 @@
 #, java-format
 msgid ""
-"This turn restriction uses the OSM node <span class=\"object-"
-"name\">{0}</span> as member with role <tt>{1}</tt>."
-msgstr ""
-"Це обмеження на поворот використовує точку OSM <span class=\"object-"
-"name\">{0}</span> в якості члена з роллю <tt>{1}</tt>."
+"This turn restriction uses the OSM node <span class=\"object-name\">{0}</"
+"span> as member with role <tt>{1}</tt>."
+msgstr ""
+"Це обмеження на поворот використовує точку OSM <span class=\"object-name\">"
+"{0}</span> в якості члена з роллю <tt>{1}</tt>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:51
 #, java-format
 msgid ""
-"This turn restriction uses the OSM relation <span class=\"object-"
-"name\">{0}</span> as member with role <tt>{1}</tt>."
-msgstr ""
-"Це обмеження на поворот використовує зв’язок OSM <span class=\"object-"
-"name\">{0}</span> в якості члена з роллю <tt>{1}</tt>."
+"This turn restriction uses the OSM relation <span class=\"object-name\">{0}</"
+"span> as member with role <tt>{1}</tt>."
+msgstr ""
+"Це обмеження на поворот використовує зв’язок OSM <span class=\"object-name\">"
+"{0}</span> в якості члена з роллю <tt>{1}</tt>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:57
@@ -20030,5 +20200,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:120
 msgid "Area style way is not closed"
-msgstr ""
+msgstr "Лінія, що позначає ділянку, не замкнена"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:134
@@ -20042,13 +20212,13 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:169
 msgid "Style for inner way equals multipolygon"
-msgstr ""
+msgstr "Стиль внутрішньої лінії — мультиполігон"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:180
 msgid "Style for outer way mismatches"
-msgstr ""
+msgstr "Невідповідність стилю зовнішньої лінії"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:186
 msgid "No style for multipolygon"
-msgstr ""
+msgstr "Немає стилю для мультиполігону"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:191
@@ -20058,5 +20228,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:213
 msgid "Multipolygon inner way is outside"
-msgstr ""
+msgstr "Внутрішня ліня мультиполігону знаходиться ззовні"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:216
@@ -20070,5 +20240,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:230
 msgid "Non-Way in multipolygon"
-msgstr ""
+msgstr "Не-лінія в мультиполігоні"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:36
@@ -20082,7 +20252,7 @@
 "Italia - Italien - Italy."
 msgstr ""
-"Ця перевірка виявила багатомовні об’єкти теґ «name» у яких не дорівнює "
-"деяким атрибутам «name:*» чи не є частиною набору атрибутів «name:*», "
-"наприклад: Italia - Italien - Italy."
+"Ця перевірка виявила багатомовні об’єкти теґ «name» у яких не дорівнює деяким "
+"атрибутам «name:*» чи не є частиною набору атрибутів «name:*», наприклад: "
+"Italia - Italien - Italy."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:47
@@ -20207,6 +20377,5 @@
 msgid ""
 "This test checks for ways that contain some of their nodes more than once."
-msgstr ""
-"Цей тест виявляє лінії, що перетинають одну точку більше одного разу."
+msgstr "Цей тест виявляє лінії, що перетинають одну точку більше одного разу."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:39
@@ -20218,6 +20387,5 @@
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
-msgstr ""
-"Цей тест виявляє лінії зі схожими назвами, можливо це помилки набору."
+msgstr "Цей тест виявляє лінії зі схожими назвами, можливо це помилки набору."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153
@@ -20343,11 +20511,10 @@
 #: ../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."
-msgstr ""
-"Джерела (URL або файл) для перевірки правопису (Див. "
-"http://wiki.openstreetmap.org/index.php/User:JLS/speller) або файли даних "
-"для перевірки теґів."
+"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
+"org/index.php/User:JLS/speller) or tag checking data files."
+msgstr ""
+"Джерела (URL або файл) для перевірки правопису (Див. http://wiki."
+"openstreetmap.org/index.php/User:JLS/speller) або файли даних для перевірки "
+"теґів."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
@@ -20405,6 +20572,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:770
 msgid "Use the default spellcheck file (recommended)."
-msgstr ""
-"Використовувати типовий файл для перевірки правопису (рекомендується)."
+msgstr "Використовувати типовий файл для перевірки правопису (рекомендується)."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:862
@@ -20453,21 +20619,21 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:113
 msgid "More than one \"from\" way found"
-msgstr ""
+msgstr "Знайдено більше ніж одна лінія «з»"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:115
 msgid "More than one \"to\" way found"
-msgstr ""
+msgstr "Знайдено більше ніж одна лінія «до»"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:117
 msgid "More than one \"via\" way found"
-msgstr ""
+msgstr "Знайдено більше ніж одна лінія «через»"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:120
 msgid "No \"from\" way found"
-msgstr ""
+msgstr "Не знайдено лінію «з»"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:124
 msgid "No \"to\" way found"
-msgstr ""
+msgstr "Не знайдено лінію «до»"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:128
@@ -20477,17 +20643,17 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:138
 msgid "The \"from\" way does not start or end at a \"via\" node"
-msgstr ""
+msgstr "Лінія «з» не починається або закінчується в точці «через»"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:143
 msgid "The \"to\" way does not start or end at a \"via\" node"
-msgstr ""
+msgstr "Лінія «до» не починається або закінчується в точці «через»"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:176
 msgid "The \"from\" way does not start or end at a \"via\" way."
-msgstr ""
+msgstr "Лінія «з» не починається або закінчується лінією «через»"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:181
 msgid "The \"to\" way does not start or end at a \"via\" way."
-msgstr ""
+msgstr "Лінія «до» не починається або закінчується лінією «через»"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:35
@@ -20543,9 +20709,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 "ділянка"
@@ -20646,12 +20812,149 @@
 msgstr "{0}, …"
 
-#: ../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
+#, fuzzy, java-format
+msgid "{0} {1}% of GPS track"
+msgstr "{0} накриває {1}% треку GPS"
+
+#: ../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 "Імпортувати аудіо"
+
+#: ../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 "Вилучити"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
+#, fuzzy
+msgid "removes current video from layer"
+msgstr "Вилучити фото із шару"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
+#, fuzzy
+msgid "play/pause"
+msgstr "Відтворення/пауза"
+
+#: ../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 "тло"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
+#, fuzzy
+msgid "jumps n sec back"
+msgstr "Перемотати назад."
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "forward"
+msgstr "Вперед"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "jumps n sec forward"
+msgstr "Перемотати вперед"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
+#, fuzzy
+msgid "faster"
+msgstr "Швидше"
+
+#: ../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 "Повільніше"
+
+#: ../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 "Дозволяє додавати мітки/точки в поточній позиції GPS ."
+
+#. 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
+#, fuzzy
+msgid "Jump length"
+msgstr "Перейти туди"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#, fuzzy
+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
+#, fuzzy
+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
+#, fuzzy
+msgid "deinterlacing using linear interpolation"
+msgstr "Фільтр інтерполяції зображень:"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:99
+#, fuzzy
+msgid "play"
+msgstr "шару"
+
+#: ../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 ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -20713,12 +21016,11 @@
 msgid "<html>Could not find a unique node to start downloading from.</html>"
 msgstr ""
-"<html>Не вдалося знайти унікальну точку, щоб почати з неї "
-"завантаження.</html>"
+"<html>Не вдалося знайти унікальну точку, щоб почати з неї завантаження.</"
+"html>"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:119
 #, java-format
 msgid "<html>There are no ways connected to node ''{0}''. Aborting.</html>"
-msgstr ""
-"<html>Відсутні лінії під’єднані до точки ''{0}''. Переривання.</html>"
+msgstr "<html>Відсутні лінії під’єднані до точки ''{0}''. Переривання.</html>"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:169
@@ -20741,6 +21043,6 @@
 msgstr ""
 "<html>Немає більше приєднаних ліній для завантаження з сервера.<br>Однак був "
-"знайдений можливий дублікат виділеної точки.<br><br>Виділена точка: "
-"''{0}''.<br>Можливий дублікат: ''{1}''<br>Провести злиття виділеної точки з "
+"знайдений можливий дублікат виділеної точки.<br><br>Виділена точка: ''{0}''."
+"<br>Можливий дублікат: ''{1}''<br>Провести злиття виділеної точки з "
 "дублікатом і продовжити завантаження лінії з сервера?</html>"
 
@@ -20751,6 +21053,5 @@
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:213
 msgid "<html>No more connected ways to download.</html>"
-msgstr ""
-"<html>Немає більше приєднаних ліній для завантаження з сервера.</html>"
+msgstr "<html>Немає більше приєднаних ліній для завантаження з сервера.</html>"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:222
@@ -20887,9 +21188,9 @@
 "Це може призвести до помилкових координат."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
 msgid "Automatic downloading"
 msgstr "Автоматичне завантаження"
 
-#: ../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}''"
@@ -20898,19 +21199,19 @@
 "спотворене"
 
-#: ../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 "Автоматичне завантаження шару WMS ({0}), в масштабі {1}"
 
-#: ../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 "Завантаження шару WMS ({0}), в масштабі {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
 #, java-format
 msgid ""
@@ -20925,17 +21226,17 @@
 "в будь-якому випадку?"
 
-#: ../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 "Невірний URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311
 msgid "Download visible tiles"
 msgstr "Завантажити видимі квадрати мапи"
 
-#: ../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"
@@ -20944,96 +21245,96 @@
 "змініть розподільчу здатність"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329
 msgid "Change resolution"
 msgstr "Змінити розподільчу здатність"
 
-#: ../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 "Зберегти шар WMS у файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
 msgid "Save WMS layer"
 msgstr "Зберегти шар WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413
 msgid "Load WMS layer from file"
 msgstr "Завантажити шар WMS з файлу"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
 msgid "Load WMS layer"
 msgstr "Завантажити шар WMS"
 
-#: ../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 "Непідтримувана версія файлу WMS; знайдено {0}, очікувалось {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 "Встановити закладку WMS"
 
-#: ../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 "Відкрити порожній шар WMS завантаження даних з файлу"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
 msgid "WMS Plugin Preferences"
 msgstr "Налаштування втулку WMS"
 
-#: ../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 "Змінити список серверів WMS, які показуються в меню втулка WMS"
 
-#: ../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 "Назва меню"
 
-#: ../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 "Посилання на 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 "Посилання на WMS (типове)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:86
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
 msgid "Enter a menu name and WMS URL"
 msgstr "Введіть назву пункту меню та посилання 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 "Завантажувач:"
@@ -21050,4 +21351,9 @@
 msgid "% of north:"
 msgstr "% на північ:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186
+#, fuzzy
+msgid "Simultaneous connections"
+msgstr "Точка: з’єднання"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -21059,7 +21365,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
@@ -21113,8 +21419,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 "лісовий масив"
@@ -21131,7 +21437,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--boundary tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -21141,5 +21447,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -21182,5 +21488,5 @@
 #. color boundary
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -21190,5 +21496,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -21198,5 +21504,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -21206,15 +21512,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 "кордон"
@@ -21230,5 +21536,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -21237,7 +21543,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--route tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -21247,5 +21553,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -21255,5 +21561,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -21263,5 +21569,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -21271,5 +21577,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -21279,5 +21585,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -21287,5 +21593,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -21295,12 +21601,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 "маршрут"
@@ -21309,5 +21615,5 @@
 #: build/specialmessages.java:21
 msgid "All Files"
-msgstr ""
+msgstr "Всі файли"
 
 #. Strings in JFileChooser
@@ -21319,5 +21625,5 @@
 #: build/specialmessages.java:23
 msgid "Abort file chooser dialog."
-msgstr ""
+msgstr "Перервати роботу діалогу вибору файлів."
 
 #. Strings in JFileChooser
@@ -21329,20 +21635,20 @@
 #: build/specialmessages.java:26
 msgid "Delete File"
-msgstr ""
+msgstr "Вилучити файл"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:28
 msgid "Enter file name:"
-msgstr ""
+msgstr "Введіть ім’я файлу:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:29
 msgid "Enter path or folder name:"
-msgstr ""
+msgstr "Введіть шлях або ім’я теки:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:30
 msgid "Error "
-msgstr ""
+msgstr "Помилка "
 
 #. Strings in JFileChooser
@@ -21350,25 +21656,25 @@
 #, java-format
 msgid "Error renaming file \"{0}\" to \"{1}\""
-msgstr ""
+msgstr "Помилка перейменування файлу \"{0}\" в \"{1}\""
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:32
 msgid "File name:"
-msgstr "Назва файлу:"
+msgstr "Ім’я файлу:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:33
 msgid "File Name:"
-msgstr ""
+msgstr "Ім’я файлу:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:34
 msgid "FileChooser help."
-msgstr ""
+msgstr "Довідка з вибору файлу."
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:35
 msgid "Files"
-msgstr ""
+msgstr "Файли"
 
 #. Strings in JFileChooser
@@ -21380,15 +21686,15 @@
 #: build/specialmessages.java:37
 msgid "Files of Type:"
-msgstr ""
+msgstr "Файли типу:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:39
 msgid "Filter:"
-msgstr ""
+msgstr "Фільтр:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:40
 msgid "Folders"
-msgstr ""
+msgstr "Теки"
 
 #. Strings in JFileChooser
@@ -21410,5 +21716,5 @@
 #: build/specialmessages.java:45
 msgid "Look In:"
-msgstr ""
+msgstr "Шукати у:"
 
 #. Strings in JFileChooser
@@ -21425,10 +21731,10 @@
 #: build/specialmessages.java:51
 msgid "Open selected file."
-msgstr ""
+msgstr "Відкрити виділений файл."
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:53
 msgid "Rename File"
-msgstr ""
+msgstr "Перейменувати файл"
 
 #. Strings in JFileChooser
@@ -21436,5 +21742,5 @@
 #, java-format
 msgid "Rename file \"{0}\" to"
-msgstr ""
+msgstr "Перйменувати файл ''{0}'' на"
 
 #. Strings in JFileChooser
@@ -21446,15 +21752,15 @@
 #: build/specialmessages.java:57
 msgid "Save In:"
-msgstr ""
+msgstr "Зберегти у:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:58
 msgid "Save selected file."
-msgstr ""
+msgstr "Зберегти виділений файл."
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:59
 msgid "Selection:"
-msgstr ""
+msgstr "Виділення:"
 
 #. Strings in JFileChooser
@@ -21471,45 +21777,45 @@
 #: build/specialmessages.java:64
 msgid "Update"
-msgstr ""
+msgstr "Оновити"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:65
 msgid "Update directory listing."
-msgstr ""
+msgstr "Оновити теку."
 
 #. Strings in GTK ColorChooser
 #: build/specialmessages.java:68
 msgid "Blue:"
-msgstr ""
+msgstr "Синій:"
 
 #. Strings in GTK ColorChooser
 #: build/specialmessages.java:69
 msgid "Color Name:"
-msgstr ""
+msgstr "Колір:"
 
 #. Strings in GTK ColorChooser
 #: build/specialmessages.java:70
 msgid "Green:"
-msgstr ""
+msgstr "Зелений:"
 
 #. Strings in GTK ColorChooser
 #: build/specialmessages.java:71
 msgid "Hue:"
-msgstr ""
+msgstr "Відтінок:"
 
 #. Strings in GTK ColorChooser
 #: build/specialmessages.java:72
 msgid "GTK Color Chooser"
-msgstr ""
+msgstr "Вибір кольору GTK"
 
 #. Strings in GTK ColorChooser
 #: build/specialmessages.java:73
 msgid "Red:"
-msgstr ""
+msgstr "Червоний:"
 
 #. Strings in GTK ColorChooser
 #: build/specialmessages.java:74
 msgid "Saturation:"
-msgstr ""
+msgstr "Насиченість:"
 
 #. Plugin AddrInterpolation
@@ -21531,6 +21837,5 @@
 #: build/trans_plugins.java:8
 msgid "A special handler for the French land registry WMS server."
-msgstr ""
-"Спеціальний обробник для сервера WMS французького земельного кадастру."
+msgstr "Спеціальний обробник для сервера WMS французького земельного кадастру."
 
 #. Plugin colorscheme
@@ -21590,7 +21895,6 @@
 
 #. 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 ""
 "Дозволяє завантажити точки GPS з Globalsat dg100 data logger безпосередньо в "
@@ -21598,15 +21902,15 @@
 
 #. 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 "
@@ -21619,10 +21923,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:34
 msgid "Helps vectorizing WMS images."
 msgstr "Допомагає оцифровувати (векторизувати) зображення WMS."
 
 #. 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."
@@ -21632,5 +21936,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 "
@@ -21643,15 +21947,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 "Додає заборону повороту ліворуч для наборів з 4 або 5 ліній"
 
 #. 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 "
@@ -21662,5 +21966,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 "
@@ -21673,15 +21977,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:48
 msgid "Displays an OpenLayers background image"
 msgstr "Показує тло OpenLayers"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:50
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Імпорт питань з OpenStreetBugs"
 
 #. 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"
@@ -21691,12 +21995,11 @@
 
 #. 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."
-msgstr ""
-"Запускає FireFox для показу поточного виду, як гарного SVG зображення."
+msgstr "Запускає FireFox для показу поточного виду, як гарного SVG зображення."
 
 #. 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 "
@@ -21707,5 +22010,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 "
@@ -21716,10 +22019,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Чудовий JGoodies Пластиковий Скін."
 
 #. 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."
@@ -21728,15 +22031,16 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "Let other applications send commands to JOSM."
 msgstr "Дозволяє іншим застосункам посилати команди JOSM."
 
 #. 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 "
@@ -21747,29 +22051,36 @@
 
 #. 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 "
 "background and request updates."
 msgstr ""
-"Показує «рухому мапу» у JOSM. Ви можете завантажувати квадрати «рухомої "
-"мапи» у якості тла та надсилати запити на її оновлення."
+"Показує «рухому мапу» у JOSM. Ви можете завантажувати квадрати «рухомої мапи» "
+"у якості тла та надсилати запити на її оновлення."
 
 #. Plugin surveyor
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:77
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Дозволяє додавати мітки/точки в поточній позиції GPS ."
 
 #. 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 "
@@ -21782,10 +22093,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). "
@@ -21797,5 +22108,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) "
@@ -21806,5 +22117,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:89
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21815,10 +22126,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:91
 msgid "Allows undeleting object from OSM database"
 msgstr "Дозволяє відновлювати об’єкти, вилучені з бази даних OSM"
 
 #. 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 "
@@ -21829,5 +22140,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 "
@@ -21840,5 +22151,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:97
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21849,15 +22160,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 "
@@ -21868,5 +22179,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:105
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22758,10 +23069,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 "Круг"
@@ -22898,8 +23209,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"/>
@@ -23109,5 +23420,5 @@
 #. color motorroad
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -23117,5 +23428,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -23134,5 +23445,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -23142,5 +23453,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -23159,5 +23470,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -23167,5 +23478,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -23184,5 +23495,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -23192,5 +23503,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -23205,5 +23516,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -23221,8 +23532,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 "місцевого значення"
@@ -23237,5 +23548,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -23244,5 +23555,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--public_transport tags -->
 #. <rule>
@@ -23252,10 +23563,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 "службова"
@@ -23270,5 +23581,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -23277,5 +23588,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -23285,10 +23596,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 "будується"
@@ -24294,9 +24605,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 "болото з відкритою водою"
@@ -24626,5 +24937,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -24634,5 +24945,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -24642,5 +24953,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -24650,5 +24961,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -24658,5 +24969,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -24666,5 +24977,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -24674,5 +24985,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -24683,5 +24994,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -24689,9 +25000,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 "рейка"
@@ -26101,5 +26412,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -26109,5 +26420,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -26117,5 +26428,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -26125,5 +26436,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -26487,7 +26798,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--sport tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -26497,5 +26808,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -26505,5 +26816,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -26513,5 +26824,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -26521,5 +26832,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -26529,5 +26840,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -26537,5 +26848,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -26545,5 +26856,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -26553,5 +26864,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -26561,5 +26872,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -26569,5 +26880,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -26577,5 +26888,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -26585,5 +26896,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -26593,5 +26904,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -26601,5 +26912,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -26609,5 +26920,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -26617,5 +26928,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -26625,5 +26936,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -26633,5 +26944,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -26641,5 +26952,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -26649,5 +26960,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -26657,5 +26968,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -26665,5 +26976,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -26673,5 +26984,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -26681,5 +26992,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -26689,5 +27000,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -26697,5 +27008,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -26705,5 +27016,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -26713,5 +27024,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -26721,5 +27032,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -26729,5 +27040,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -26737,5 +27048,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -26745,5 +27056,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -26753,5 +27064,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -26761,5 +27072,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -26769,5 +27080,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -26777,5 +27088,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -26785,5 +27096,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -26793,5 +27104,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -26801,5 +27112,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -26809,5 +27120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -26817,5 +27128,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -26825,5 +27136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -26833,5 +27144,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -26841,5 +27152,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -26849,5 +27160,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -26857,33 +27168,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 "спорт"
@@ -28561,7 +28872,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--landuse tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -28571,5 +28882,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -28579,5 +28890,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -28587,5 +28898,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -28595,5 +28906,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -28603,5 +28914,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -28611,5 +28922,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -28619,5 +28930,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -28627,12 +28938,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 "зелений"
@@ -30048,5 +30359,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -30062,5 +30373,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -30070,18 +30381,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 -->
@@ -30090,7 +30418,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- cycleway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -30100,5 +30428,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -30108,5 +30436,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -30116,5 +30444,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -30124,12 +30452,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 "велосипедний"
@@ -30156,5 +30485,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -30170,5 +30499,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -30178,5 +30507,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -30185,13 +30514,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"/>
@@ -30202,11 +30539,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 "піший"
@@ -30225,8 +30563,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 "метро"
@@ -30338,9 +30676,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
@@ -30348,5 +30686,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,
@@ -30356,8 +30694,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
@@ -30371,5 +30709,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#. 
+#.
 #: build/trans_style.java:72
 msgid "standard"
@@ -30377,5 +30715,5 @@
 
 #. mappaint style named "standard"
-#. 
+#.
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -30424,6 +30762,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>
@@ -30503,5 +30841,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -30511,16 +30849,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 "застарілий"
@@ -30531,5 +30869,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -30538,5 +30876,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -30545,5 +30883,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -30559,5 +30897,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -30571,5 +30909,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -30578,5 +30916,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -30585,5 +30923,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -30592,5 +30930,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -30599,5 +30937,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -30606,5 +30944,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -30613,5 +30951,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxweight"/>
@@ -30620,5 +30958,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxheight"/>
@@ -30627,5 +30965,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -30634,5 +30972,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxlength"/>
@@ -30641,5 +30979,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -30648,5 +30986,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="minspeed"/>
@@ -30655,5 +30993,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxstay"/>
@@ -30662,5 +31000,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="toll"/>
@@ -30669,5 +31007,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="barrier"/>
@@ -30844,7 +31182,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- highway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -30858,5 +31196,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -30866,7 +31204,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- tracktype tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -30876,5 +31214,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -30884,5 +31222,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -30892,5 +31230,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -30900,10 +31238,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 "траса"
@@ -30914,5 +31252,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -30921,5 +31259,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -30929,5 +31267,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -30936,5 +31274,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -30943,5 +31281,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -30950,5 +31288,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -30957,5 +31295,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -30964,5 +31302,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -30971,5 +31309,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -30978,5 +31316,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -30985,5 +31323,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -30992,8 +31330,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 "послуги"
@@ -31004,8 +31342,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 "брід"
@@ -31016,5 +31354,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -31023,8 +31361,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 "коло для розвороту"
@@ -31035,9 +31373,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 "пункт першої допомоги"
@@ -31048,9 +31386,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 "берег ріки"
@@ -31061,8 +31399,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 "струмок"
@@ -31073,8 +31411,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 "док"
@@ -31085,5 +31423,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -31092,5 +31430,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -31099,5 +31437,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -31107,5 +31445,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -31114,5 +31452,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -31121,5 +31459,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -31128,5 +31466,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -31136,5 +31474,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -31145,5 +31483,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -31153,7 +31491,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--man_made tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -31163,5 +31501,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -31171,5 +31509,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -31179,5 +31517,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -31188,5 +31526,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -31195,5 +31533,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -31203,5 +31541,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -31211,5 +31549,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -31219,5 +31557,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -31227,5 +31565,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -31235,5 +31573,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -31243,5 +31581,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -31251,5 +31589,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -31259,5 +31597,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -31267,18 +31605,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 "штучний"
@@ -31288,9 +31626,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 "пороги"
@@ -31301,7 +31639,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- railway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -31311,5 +31649,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -31318,5 +31656,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -31326,5 +31664,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -31333,5 +31671,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -31341,5 +31679,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -31349,10 +31687,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 "точка залізниці"
@@ -31363,5 +31701,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -31372,13 +31710,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 "колія зверху"
@@ -31389,5 +31727,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -31397,5 +31735,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -31408,5 +31746,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -31414,7 +31752,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 "стара колія"
@@ -31425,5 +31763,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -31432,5 +31770,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -31439,5 +31777,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -31446,7 +31784,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aeroway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -31457,9 +31795,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 "авіатраса"
@@ -31470,8 +31808,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 "термінал"
@@ -31482,5 +31820,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -31490,8 +31828,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 "Завантажена авіатраса"
@@ -31502,8 +31840,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 "Помірно завантажена авіатраса"
@@ -31514,5 +31852,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -31521,5 +31859,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -31528,7 +31866,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aerialway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -31538,5 +31876,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -31546,5 +31884,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -31554,5 +31892,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -31562,5 +31900,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -31570,10 +31908,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 "канатна дорога"
@@ -31584,11 +31922,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 "легка лижня"
@@ -31599,9 +31937,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 "нормальна лижня"
@@ -31612,9 +31950,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 "ускладнена лижня"
@@ -31625,9 +31963,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 "складна лижня"
@@ -31638,9 +31976,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 "дуже складня лижня"
@@ -31651,9 +31989,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 "лижня для новачків"
@@ -31664,7 +32002,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--power tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -31674,5 +32012,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -31681,5 +32019,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -31689,5 +32027,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -31697,5 +32035,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -31705,5 +32043,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -31713,5 +32051,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -31721,5 +32059,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -31729,5 +32067,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -31737,5 +32075,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -31745,5 +32083,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -31753,5 +32091,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -31761,5 +32099,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -31769,15 +32107,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 "енергія"
@@ -31787,9 +32125,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 "пірс"
@@ -31800,8 +32138,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 "трубопровід"
@@ -31811,7 +32149,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--leisure tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -31821,5 +32159,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -31829,5 +32167,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -31837,5 +32175,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -31845,5 +32183,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -31853,5 +32191,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -31861,5 +32199,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -31869,5 +32207,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -31877,5 +32215,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -31885,5 +32223,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -31893,5 +32231,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -31901,5 +32239,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -31909,5 +32247,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -31917,5 +32255,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -31925,5 +32263,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -31933,5 +32271,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -31941,17 +32279,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 "розваги"
@@ -31961,9 +32299,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 "гавань"
@@ -31973,7 +32311,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--amenity tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -31983,5 +32321,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -31991,5 +32329,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -31999,5 +32337,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -32007,5 +32345,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -32015,5 +32353,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -32023,5 +32361,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -32031,5 +32369,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -32039,5 +32377,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -32047,5 +32385,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -32055,14 +32393,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 "зручності"
@@ -32072,5 +32410,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -32080,5 +32418,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -32088,5 +32426,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -32096,5 +32434,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -32104,5 +32442,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -32112,5 +32450,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -32120,5 +32458,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -32128,5 +32466,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -32136,5 +32474,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -32144,5 +32482,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -32152,5 +32490,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -32160,14 +32498,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 "зручності пересування"
@@ -32177,5 +32515,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -32184,5 +32522,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -32192,5 +32530,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -32199,5 +32537,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -32207,5 +32545,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -32215,5 +32553,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -32223,5 +32561,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -32230,5 +32568,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -32238,5 +32576,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -32246,5 +32584,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -32254,5 +32592,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -32262,5 +32600,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -32269,5 +32607,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -32276,5 +32614,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -32283,5 +32621,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -32290,5 +32628,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -32297,5 +32635,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -32304,5 +32642,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -32311,5 +32649,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -32318,5 +32656,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -32325,5 +32663,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -32332,5 +32670,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -32339,5 +32677,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -32346,5 +32684,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -32353,5 +32691,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -32361,5 +32699,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -32369,5 +32707,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -32377,5 +32715,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -32385,5 +32723,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -32393,5 +32731,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -32401,5 +32739,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -32409,5 +32747,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -32417,5 +32755,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -32425,5 +32763,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -32434,5 +32772,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -32442,5 +32780,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -32450,5 +32788,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -32458,5 +32796,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -32466,5 +32804,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -32474,5 +32812,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -32482,5 +32820,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -32490,5 +32828,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -32498,5 +32836,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -32506,5 +32844,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -32514,5 +32852,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -32522,5 +32860,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -32530,5 +32868,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -32538,5 +32876,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -32546,5 +32884,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -32554,5 +32892,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"/>
@@ -32562,5 +32908,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -32570,5 +32916,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -32578,5 +32924,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -32586,5 +32932,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -32593,27 +32939,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 "зручності прості"
@@ -32623,5 +32970,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -32631,5 +32978,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -32639,12 +32986,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 "легка вода"
@@ -32654,5 +33001,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -32662,5 +33009,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -32670,5 +33017,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -32678,5 +33025,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -32686,5 +33033,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -32694,5 +33041,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -32702,11 +33049,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 "медицина"
@@ -32716,7 +33063,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--shop tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -32726,5 +33073,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -32734,5 +33081,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -32742,5 +33089,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -32750,5 +33097,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -32758,5 +33105,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -32766,5 +33113,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -32774,5 +33121,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -32782,5 +33129,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -32790,5 +33137,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -32798,5 +33145,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -32806,5 +33153,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -32814,5 +33161,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -32822,5 +33169,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -32830,5 +33177,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -32838,5 +33185,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -32846,5 +33193,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -32854,5 +33201,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -32862,5 +33209,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -32870,5 +33217,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -32878,5 +33225,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -32886,5 +33233,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -32894,5 +33241,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -32902,5 +33249,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -32910,5 +33257,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -32918,5 +33265,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -32926,5 +33273,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -32934,5 +33281,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -32942,5 +33289,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -32950,5 +33297,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -32958,5 +33305,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -32966,5 +33313,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -32974,5 +33321,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -32982,5 +33329,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -32990,5 +33337,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -32998,5 +33345,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -33006,5 +33353,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -33014,5 +33361,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -33022,5 +33369,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -33030,5 +33377,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -33038,5 +33385,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -33046,5 +33393,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -33054,31 +33401,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 "магазин"
@@ -33088,7 +33435,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--tourism tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -33098,5 +33445,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -33106,5 +33453,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -33114,5 +33461,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -33122,5 +33469,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -33130,5 +33477,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -33138,5 +33485,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -33146,12 +33493,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 "готель"
@@ -33161,5 +33508,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -33169,5 +33516,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -33177,5 +33524,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -33185,5 +33532,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -33193,5 +33540,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -33201,5 +33548,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -33210,5 +33557,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -33218,5 +33565,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- information tags -->
 #. <rule>
@@ -33226,5 +33573,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -33234,5 +33581,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -33241,5 +33588,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -33248,13 +33595,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 "туристичний"
@@ -33264,7 +33611,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--historic tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -33274,5 +33621,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -33282,5 +33629,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -33290,5 +33637,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -33298,5 +33645,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -33306,5 +33653,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -33314,5 +33661,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -33322,5 +33669,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -33330,5 +33677,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -33338,13 +33685,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 "історичний"
@@ -33354,8 +33701,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 "кар’єр"
@@ -33366,8 +33713,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 "звалище"
@@ -33378,5 +33725,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -33386,8 +33733,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 "водойма"
@@ -33398,8 +33745,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 "двір ферми"
@@ -33410,6 +33757,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
-#. 
+#.
+#.
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -33419,8 +33766,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 "роздрібна торгівля"
@@ -33431,8 +33778,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 "промисловість"
@@ -33443,8 +33790,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 "очищене місце під забудову"
@@ -33455,8 +33802,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 "місце під нову забудову"
@@ -33467,8 +33814,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 "територія залізниці"
@@ -33479,5 +33826,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -33487,7 +33834,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--military tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -33497,5 +33844,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -33505,5 +33852,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -33513,5 +33860,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -33521,11 +33868,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 "військовий"
@@ -33536,8 +33883,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 "кладовище"
@@ -33547,8 +33894,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 "гірська вершина"
@@ -33559,9 +33906,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 "льодовик"
@@ -33571,9 +33918,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 "вулкан"
@@ -33583,5 +33930,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -33592,5 +33939,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -33600,5 +33947,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -33608,5 +33955,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -33616,5 +33963,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -33624,12 +33971,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 "довкілля"
@@ -33639,9 +33986,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 "чагарник"
@@ -33651,9 +33998,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 "верес"
@@ -33663,9 +34010,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 "ліс"
@@ -33675,9 +34022,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 "грязь"
@@ -33687,9 +34034,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 "пляж"
@@ -33700,5 +34047,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?
@@ -33724,5 +34071,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -33733,11 +34080,11 @@
 #. </rule>
 #. -->
-#. 
+#.
 #. <!--name tags -->
-#. 
+#.
 #. <!--preferences tags -->
-#. 
+#.
 #. <!--place tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -33747,5 +34094,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -33755,5 +34102,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -33763,5 +34110,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -33771,5 +34118,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -33779,5 +34126,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -33787,5 +34134,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -33795,5 +34142,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -33803,5 +34150,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -33811,5 +34158,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -33819,5 +34166,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -33827,5 +34174,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -33835,15 +34182,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 "місцевість"
@@ -33853,9 +34200,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 "дані TIGER"
@@ -33946,5 +34293,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#. 
+#.
 #. Data type can be:
 #. node        - a node point
@@ -33952,28 +34299,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
@@ -34055,6 +34402,5 @@
 #: build/trans_validator.java:66 build/trans_validator.java:67
 msgid "maxspeed used for footway"
-msgstr ""
-"максимальна швидкість руху транспорту дозволена на пішохідній доріжці"
+msgstr "максимальна швидкість руху транспорту дозволена на пішохідній доріжці"
 
 #. way  : I : highway == steps && maxspeed == *
@@ -34089,5 +34435,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#. 
+#.
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -34100,5 +34446,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>
@@ -34123,6 +34469,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#. 
-#. 
+#.
+#.
 #. only for Germany
 #: build/trans_wms.java:17
@@ -34131,6 +34477,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#. 
-#. 
+#.
+#.
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -34145,6 +34491,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
@@ -34158,6 +34504,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
@@ -34177,6 +34523,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#. 
-#. 
+#.
+#.
 #. only for Japan
 #: build/trans_wms.java:39
@@ -34200,6 +34546,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
@@ -34212,34 +34558,38 @@
 msgstr "Італія – Сицилія"
 
-#, 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 ""
+#~ "Отриманий об’єкт з ідентифікатором {0} та версією {1} видимий, хоча "
+#~ "первинний об’єкт з нижчою версією {2} не видимий. Ця невідповідність "
+#~ "неможлива. Отриманий об’єкт збережено. "
+
 #~ msgid "Error: {0}"
 #~ msgstr "Помилка: {0}"
 
-#, java-format
 #~ msgid "Warning: {0}"
 #~ msgstr "Попередження: {0}"
 
-#, java-format
 #~ msgid "Style for inner way ''{0}'' equals multipolygon."
 #~ msgstr "Стиль внутрішньої лінії \"{0}\" такий же, як у мультиполігону."
 
-#, java-format
 #~ msgid "Style for outer way ''{0}'' mismatches."
 #~ msgstr "Стиль зовнішньої лінії \"{0}\" не узгоджений."
 
-#, java-format
 #~ msgid ""
 #~ "<html>There are {0} primitives in your local dataset which<br>might be "
 #~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
-#~ "to check the state of these primitives<br>on the server.<br>Click "
+#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
+#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
 #~ "<strong>{2}</strong> to ignore.<br></html>"
 #~ msgstr ""
-#~ "<html>Кількість елементів у вашому наборі даних — {0}, <br>вони можуть бути "
-#~ "вилученими на сервері. В подальшому, якщо ви спробуєте вилучити "
-#~ "або<br>оновити їх, сервер скоріш за все сповістить "
-#~ "про<br>конфлікт.<br><br>Натисніть <strong>{1}</strong> щоб перевірити стан "
-#~ "цих елементів<br>на сервері.<br>Натисніть <strong>{2}</strong> щоб "
-#~ "ігнорувати.<br></html>"
+#~ "<html>Кількість елементів у вашому наборі даних — {0}, <br>вони можуть "
+#~ "бути вилученими на сервері. В подальшому, якщо ви спробуєте вилучити "
+#~ "або<br>оновити їх, сервер скоріш за все сповістить про<br>конфлікт."
+#~ "<br><br>Натисніть <strong>{1}</strong> щоб перевірити стан цих "
+#~ "елементів<br>на сервері.<br>Натисніть <strong>{2}</strong> щоб ігнорувати."
+#~ "<br></html>"
 
 #~ msgid "Errors during Download"
@@ -34249,5 +34599,4 @@
 #~ msgstr "Вилучені або переміщені елементи"
 
-#, java-format
 #~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
 #~ msgstr "Помилка синтаксису шаблону: Шаблон {0} в {1} неприпустимий!"
@@ -34262,5 +34611,4 @@
 #~ msgstr "Лінія, що показує межу ділянки, не замкнена."
 
-#, java-format
 #~ msgid "Unknown role ''{0}''."
 #~ msgstr "Невідома роль ''{0}''."
@@ -34272,13 +34620,10 @@
 #~ msgstr "Лінію «від» не знайдено."
 
-#, java-format
 #~ msgid "Unknown member type for ''{0}''."
 #~ msgstr "Невідомий тип члегна ''{0}''."
 
-#, java-format
 #~ msgid "Style for restriction {0} not found."
 #~ msgstr "Стиль для обмеження {0} не знайдено."
 
-#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Стек команд: {0}"
@@ -34290,5 +34635,4 @@
 #~ msgstr "точка GPS"
 
-#, java-format
 #~ msgid "Uploading {0} objects ..."
 #~ msgstr "Надсилання об’єктів. Кількість —  {0}…"
@@ -34300,5 +34644,4 @@
 #~ msgstr "Вкажіть кут будівлі, щоб почати креслення"
 
-#, java-format
 #~ msgid "reverter: {0}"
 #~ msgstr "відновлювач: {0}"
Index: /applications/editors/josm/i18n/po/zh_TW.po
===================================================================
--- /applications/editors/josm/i18n/po/zh_TW.po	(revision 21970)
+++ /applications/editors/josm/i18n/po/zh_TW.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-15 14:41+0000\n"
+"POT-Creation-Date: 2010-06-23 22:47+0200\n"
+"PO-Revision-Date: 2010-06-16 12:45+0000\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Traditional Chinese\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-06-15 16:22+0000\n"
+"X-Launchpad-Export-Date: 2010-06-23 20:23+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: zh_TW\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
@@ -196,5 +196,7 @@
 "WARNING: unexpected format of API base URL. Redirection to info or history "
 "page for OSM primitive will probably fail. API base URL is: ''{0}''"
-msgstr "警告：未預期的 API 基礎 URL 格式。重新導向至 OSM 原型的資訊或歷史紀錄頁面可能會失敗。API 基礎 URL 為：「{0}」"
+msgstr ""
+"警告：未預期的 API 基礎 URL 格式。重新導向至 OSM 原型的資訊或歷史紀錄頁面可能"
+"會失敗。API 基礎 URL 為：「{0}」"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63
@@ -203,5 +205,7 @@
 "WARNING: unexpected format of API base URL. Redirection to user page for OSM "
 "user will probably fail. API base URL is: ''{0}''"
-msgstr "警告：未預期的 API 基礎 URL 格式。重新導向至 OSM 使用者的使用者頁面可能會失敗。API 基礎 URL 為：「{0}」"
+msgstr ""
+"警告：未預期的 API 基礎 URL 格式。重新導向至 OSM 使用者的使用者頁面可能會失"
+"敗。API 基礎 URL 為：「{0}」"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86
@@ -210,5 +214,7 @@
 "You are about to launch {0} browser windows.<br>This may both clutter your "
 "screen with browser windows<br>and take some time to finish."
-msgstr "您即將開啟 {0} 個瀏覽器視窗。<br>這可能會使螢幕被瀏覽器視窗塞滿<br>並且得花上一些時間才能完成。"
+msgstr ""
+"您即將開啟 {0} 個瀏覽器視窗。<br>這可能會使螢幕被瀏覽器視窗塞滿<br>並且得花上"
+"一些時間才能完成。"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
@@ -247,5 +253,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 +274,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 +280,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 +290,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 +327,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 "<html>來源圖層<br>''{0}''<br>中沒有任何圖層可合併。</html>"
 
@@ -340,9 +350,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 +412,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 +450,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 "資訊"
@@ -645,5 +656,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 +669,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 "刪除"
@@ -905,4 +916,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 ""
@@ -912,4 +924,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 "這樣可能會造成節點被意外的刪除。"
@@ -1268,7 +1281,8 @@
 "shortcut for Orthogonalize / Undo. The default is Shift-Q.)"
 msgstr ""
-"<h3>當選取一或多個路徑後，形狀會被調整，使所有的角都是 90 或 180 "
-"度。</h3>您可以在選擇區域中加入兩個節點。這樣子它的方向就會被這兩個參考節點所修正。（之後，您可以復原某些節點的移動：<br>選擇它們並按下 直角化 "
-"/ 復原 的捷徑鍵。預設值為 Shift-Q。）"
+"<h3>當選取一或多個路徑後，形狀會被調整，使所有的角都是 90 或 180 度。</h3>您"
+"可以在選擇區域中加入兩個節點。這樣子它的方向就會被這兩個參考節點所修正。（之"
+"後，您可以復原某些節點的移動：<br>選擇它們並按下 直角化 / 復原 的捷徑鍵。預設"
+"值為 Shift-Q。）"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45
@@ -1314,6 +1328,6 @@
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
 msgstr ""
-"<html>您使用的 EPSG:4326 "
-"投影法會導致在進行<br>矩形排列時產生不想要的結果。<br>改變您的投影法可以去除這項警告。<br>是否要繼續？</html>"
+"<html>您使用的 EPSG:4326 投影法會導致在進行<br>矩形排列時產生不想要的結果。"
+"<br>改變您的投影法可以去除這項警告。<br>是否要繼續？</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:148
@@ -1338,5 +1352,7 @@
 "<html>Please make sure all selected ways head in a similar direction<br>or "
 "orthogonalize them one by one.</html>"
-msgstr "<html>請確定所有選取的路徑都朝著類似的方向<br>或是分次將它們一個個直角化。</html>"
+msgstr ""
+"<html>請確定所有選取的路徑都朝著類似的方向<br>或是分次將它們一個個直角化。</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:417
@@ -1371,5 +1387,7 @@
 "primitives are removed.  Do you want to paste the data without the "
 "incomplete primitives?"
-msgstr "複製的資料含有不完整的原型。當貼上的時候不完整的原型會被移除。您確定要貼上含有不完整原型的資料嗎？"
+msgstr ""
+"複製的資料含有不完整的原型。當貼上的時候不完整的原型會被移除。您確定要貼上含"
+"有不完整原型的資料嗎？"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
@@ -1461,6 +1479,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
@@ -1487,4 +1505,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
@@ -1493,6 +1513,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 "錯誤"
@@ -1604,6 +1624,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 "顯示有與程式錯誤相關資訊的狀態報告"
 
@@ -1639,8 +1658,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 +1670,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 +1677,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 "請選擇至少一條路徑來簡化。"
@@ -1673,13 +1700,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 +1718,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"
@@ -1698,4 +1730,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)"
@@ -1754,5 +1787,7 @@
 "<html>A role based relation membership was copied to all new ways.<br>You "
 "should verify this and correct it when necessary.</html>"
-msgstr "<html>以角色為基礎的關係成員會複製到所有的新路徑。<br>必要時您應該檢驗並修正它。</html>"
+msgstr ""
+"<html>以角色為基礎的關係成員會複製到所有的新路徑。<br>必要時您應該檢驗並修正"
+"它。</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
@@ -1761,6 +1796,6 @@
 "this and correct it when necessary.</html>"
 msgstr ""
-"<html>將關係成員複製到所有的新路徑。<br>您應該在You should verify this and correct it when "
-"necessary.</html>"
+"<html>將關係成員複製到所有的新路徑。<br>您應該在You should verify this and "
+"correct it when necessary.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
@@ -1821,6 +1856,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 "* 一個用於多條路徑或用於那些路徑之一的節點，或"
 
@@ -1888,9 +1922,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)"
@@ -1907,5 +1941,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
@@ -1964,10 +1998,11 @@
 "<html>The data to be uploaded participates in unresolved conflicts of layer "
 "''{0}''.<br>You have to resolve them first.</html>"
-msgstr "<html>要上傳的資料影響到的圖層「{0}」仍未調解衝突。<br>您必須先調解它們。</html>"
+msgstr ""
+"<html>要上傳的資料影響到的圖層「{0}」仍未調解衝突。<br>您必須先調解它們。</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:153
 #: ../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 "沒有要上傳的變更。"
@@ -1985,14 +2020,14 @@
 msgstr "將目前的選擇區域上傳至 OSM 伺服器。"
 
-#: ../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 "正在讀取「{0}」的上層項目"
 
-#: ../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 "正在檢查在本地端資料組合中被刪除的上層項目"
@@ -2169,5 +2204,7 @@
 "server. If you later try to delete or update them the server is likely to "
 "report a conflict."
-msgstr[0] "在您本地資料組合中有 {0} 個物件可能在伺服器上已經刪除了。如果您稍後嘗試刪除或更新到伺服器，很可能會回報為衝突。"
+msgstr[0] ""
+"在您本地資料組合中有 {0} 個物件可能在伺服器上已經刪除了。如果您稍後嘗試刪除或"
+"更新到伺服器，很可能會回報為衝突。"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:169
@@ -2243,5 +2280,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
@@ -2254,5 +2291,7 @@
 "Click to delete. Shift: delete way segment. Alt: do not delete unused nodes "
 "when deleting a way. Ctrl: delete referring objects."
-msgstr "點選可進行刪除。Shift：刪除路徑區段。Alt：刪除路徑時不要刪除未使用的節點。Ctrl：刪除參考的物件。"
+msgstr ""
+"點選可進行刪除。Shift：刪除路徑區段。Alt：刪除路徑時不要刪除未使用的節點。"
+"Ctrl：刪除參考的物件。"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
@@ -2355,7 +2394,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
 msgid ""
-"Drag play head and release near track to play audio from there; "
-"SHIFT+release to synchronize audio at that point."
-msgstr "將播放開頭拖曳並放至要播放音效的軌跡旁；按 SHIFT+釋放就會從那一點同步化音效。"
+"Drag play head and release near track to play audio from there; SHIFT"
+"+release to synchronize audio at that point."
+msgstr ""
+"將播放開頭拖曳並放至要播放音效的軌跡旁；按 SHIFT+釋放就會從那一點同步化音效。"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
@@ -2420,5 +2460,7 @@
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
 "Ctrl to rotate selected; or change selection"
-msgstr "以拖曳移動物件；按 Shift 加入選擇區域(Ctrl 可切換)；Shift-Ctrl 會旋轉選取的；或改變選擇區域"
+msgstr ""
+"以拖曳移動物件；按 Shift 加入選擇區域(Ctrl 可切換)；Shift-Ctrl 會旋轉選取的；"
+"或改變選擇區域"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
@@ -2435,5 +2477,7 @@
 "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
 "move zoom with right button"
-msgstr "拖曳或 Ctrl+. 或 Ctrl+, 來縮放；Ctrl+up, left, down, right 可移動；按右鍵可移動縮放"
+msgstr ""
+"拖曳或 Ctrl+. 或 Ctrl+, 來縮放；Ctrl+up, left, down, right 可移動；按右鍵可移"
+"動縮放"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48
@@ -2483,5 +2527,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."
@@ -2549,6 +2593,6 @@
 "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
 msgstr ""
-"<b>type=*</b> - 設定鍵「type」為任何數值。也可以使用 "
-"<b>*=value</b>、<b>type=</b>、<b>*=*</b>、<b>*=</b>"
+"<b>type=*</b> - 設定鍵「type」為任何數值。也可以使用 <b>*=value</b>、"
+"<b>type=</b>、<b>*=*</b>、<b>*=</b>"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
@@ -2572,5 +2616,6 @@
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr ""
-"<b>類型：</b> - 物件的類型 (<b>節點(node)</b>, <b>路徑(way)</b>, <b>關係(relation)</b>)"
+"<b>類型：</b> - 物件的類型 (<b>節點(node)</b>, <b>路徑(way)</b>, <b>關係"
+"(relation)</b>)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
@@ -2596,11 +2641,14 @@
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
 "assigned changeset)"
-msgstr "<b>變更組合：</b>... - 查看這個變更組合 id 的物件（未指定變更組合則為 0 個物件）"
+msgstr ""
+"<b>變更組合：</b>... - 查看這個變更組合 id 的物件（未指定變更組合則為 0 個物"
+"件）"
 
 #: ../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)"
-msgstr "<b>節點：</b>... - 有指定數量的節點的物件 (nodes:count 或 nodes:min-max)"
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
+"min-max)"
+msgstr ""
+"<b>節點：</b>... - 有指定數量的節點的物件 (nodes:count 或 nodes:min-max)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
@@ -2619,6 +2667,6 @@
 "12T14:51:09Z</b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
 msgstr ""
-"<b>時刻戳記：</b>... -  有此時刻戳記的物件 (<b>2009-11-12T14:51:09Z</b>，<b>2009-11-12</b> "
-"或 <b>T14:51</b> ...)"
+"<b>時刻戳記：</b>... -  有此時刻戳記的物件 (<b>2009-11-12T14:51:09Z</b>，"
+"<b>2009-11-12</b> 或 <b>T14:51</b> ...)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
@@ -2661,6 +2709,6 @@
 "escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
 msgstr ""
-"有引號的字串 <b>\"</b> 和 <b>\\</b> 字元需要在前頭加上 <b>\\</b> (例如 <b>\\\"</b> 和 <b>\\\\"
-"</b>)。"
+"有引號的字串 <b>\"</b> 和 <b>\\</b> 字元需要在前頭加上 <b>\\</b> (例如 <b>\\"
+"\"</b> 和 <b>\\\\</b>)。"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
@@ -2817,5 +2865,7 @@
 "Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
 "length {2}. Values length is {3}."
-msgstr "在物件 {1} 上的標籤「{0}」數值的長度超過最大值。允許的長度為 {2}。數值的長度為 {3}。"
+msgstr ""
+"在物件 {1} 上的標籤「{0}」數值的長度超過最大值。允許的長度為 {2}。數值的長度"
+"為 {3}。"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70
@@ -2843,5 +2893,6 @@
 "dependency.</html>"
 msgstr ""
-"<html>{0} 關係形成一個循環，因為它們互相參照對方。<br>JOSM 不能上傳它們。請編輯這個關係並移除掉這個循環相依性。</html>"
+"<html>{0} 關係形成一個循環，因為它們互相參照對方。<br>JOSM 不能上傳它們。請編"
+"輯這個關係並移除掉這個循環相依性。</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
@@ -2872,10 +2923,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
@@ -2976,5 +3031,7 @@
 "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''.<br>This "
 "conflict cannot be added.</html>"
-msgstr "<html>圖層「{0}」已有衝突發生於原型<br>「{1}」。<br>這個衝突不能被加入。</html>"
+msgstr ""
+"<html>圖層「{0}」已有衝突發生於原型<br>「{1}」。<br>這個衝突不能被加入。</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36
@@ -2996,5 +3053,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
@@ -3068,8 +3125,10 @@
 #: ../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?"
-msgstr "您將要刪除在下載的區域外的節點。<br>這樣有時會發生問題，因為其他物件（您沒有看到的）可能會使用它們。<br>確定要刪除嗎？"
+"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 ""
+"您將要刪除在下載的區域外的節點。<br>這樣有時會發生問題，因為其他物件（您沒有"
+"看到的）可能會使用它們。<br>確定要刪除嗎？"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
@@ -3085,5 +3144,7 @@
 "You are about to delete incomplete objects.<br>This will cause problems "
 "because you don't see the real object.<br>Do you really want to delete?"
-msgstr "您即將刪除不完整的物件。<br>這樣會造成問題，因為您沒有看到實際的物件。<br>您確定要刪除嗎？"
+msgstr ""
+"您即將刪除不完整的物件。<br>這樣會造成問題，因為您沒有看到實際的物件。<br>您"
+"確定要刪除嗎？"
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:42
@@ -3113,11 +3174,11 @@
 msgstr[0] "移動 {0} 個節點"
 
-#: ../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 "清理的物件「{0}」"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111
 #, java-format
 msgid "Purged {0} object"
@@ -3125,5 +3186,5 @@
 msgstr[0] "已清除 {0} 個物件"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 #, java-format
 msgid ""
@@ -3132,5 +3193,5 @@
 msgstr "警告：將清除路徑 {0}，因為其節點數已低於 2。目前為 {1}"
 
-#: ../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}"
@@ -3206,5 +3267,7 @@
 "When reversing this way, the following changes to properties of the way and "
 "its nodes are suggested in order to maintain data consistency."
-msgstr "在反轉這條路徑時，為了維持資料的一致性，建議下列對該路徑的屬性與其節點的變更。"
+msgstr ""
+"在反轉這條路徑時，為了維持資料的一致性，建議下列對該路徑的屬性與其節點的變"
+"更。"
 
 #: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26
@@ -3334,7 +3397,9 @@
 #, java-format
 msgid ""
-"<html>Preferences file had errors.<br> Making backup of old one to "
-"<br>{0}<br> and creating a new default preference file.</html>"
-msgstr "<html>偏好設定檔案有錯誤。<br>將舊的設定製作備份為 <br>{0}<br> 並建立新的預設偏好設定檔案。</html>"
+"<html>Preferences file had errors.<br> Making backup of old one to <br>{0}"
+"<br> and creating a new default preference file.</html>"
+msgstr ""
+"<html>偏好設定檔案有錯誤。<br>將舊的設定製作備份為 <br>{0}<br> 並建立新的預設"
+"偏好設定檔案。</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
@@ -3416,5 +3481,5 @@
 #. *
 #. * the decimal format 999.999
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3423,5 +3488,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3430,5 +3495,5 @@
 #. *
 #. * coordinates East/North
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3472,9 +3537,12 @@
 "error, it should be safe to continue in your work."
 msgstr ""
-"JOSM 預期在資料組合中會找到原型 [{0} {1}] 但卻沒有。請在 http://josm.openstreetmap.de "
-"回報這個情況。這不是嚴重的錯誤，繼續您的工作應是安全的。"
+"JOSM 預期在資料組合中會找到原型 [{0} {1}] 但卻沒有。請在 http://josm."
+"openstreetmap.de 回報這個情況。這不是嚴重的錯誤，繼續您的工作應是安全的。"
 
 #: ../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}"
@@ -3486,30 +3554,24 @@
 msgstr "缺少 id {0} 物件的合併目標"
 
-#: ../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 "缺少 id {0} 節點的合併目標"
 
-#: ../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 "缺少 id {0} 關係的合併目標"
 
-#: ../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 "缺少 id {1} 類型 {0} 的合併目標"
-
-#. 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 "id {0} 版本 {1} 的目標物件是可視的，但是來源物件 (較低版本 {2}) 是隱藏的。不能處理這個不一致的情形。保留目標物件。 "
 
 #. translators notes must be in front
@@ -3587,19 +3649,19 @@
 msgstr "</p><p>關閉過濾條件對話盒以查看所有的物件。<p></html>"
 
-#: ../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 "ID = 0 的原型不能為不可視。"
 
-#: ../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 "預期 ID > 0。收到 {0}。"
 
-#: ../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 "預期版本 > 0。收到 {0}。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:795
 #, java-format
 msgid ""
@@ -3608,5 +3670,5 @@
 msgstr "不能將 changesetId > 0 指派給新的原型。changesetId 的數值為 {0}"
 
-#: ../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 "
@@ -3614,5 +3676,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 ""
@@ -3665,6 +3727,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 "不能比較 ID「{0}」和 ID「{1}」的原型。"
 
@@ -3679,5 +3740,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 "已選取"
@@ -3841,6 +3902,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 "<html>無法讀取書籤<br>''{0}''<br>錯誤為：{1}</html>"
 
@@ -3910,5 +3970,5 @@
 #. color tiger_data
 #. </rule>
-#. 
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -3918,5 +3978,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -3925,5 +3985,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -3932,5 +3992,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -3939,5 +3999,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -3946,5 +4006,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -3953,9 +4013,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--annotation tags -->
-#. 
+#.
 #. <!--"work in progress" tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="building"/>
@@ -3964,5 +4024,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 "建築"
@@ -4048,5 +4108,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
@@ -4109,5 +4169,6 @@
 "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
 "filename"
-msgstr "下載每樣。可以是 x1,y1,x2,y2、含有 lat=y&lon=x&zoom=z 的 URL 或檔案名稱"
+msgstr ""
+"下載每樣。可以是 x1,y1,x2,y2、含有 lat=y&lon=x&zoom=z 的 URL 或檔案名稱"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
@@ -4115,5 +4176,7 @@
 "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
 "lat=y&lon=x&zoom=z or a filename"
-msgstr "下載每樣當作原始 gps。可以是 x1,y1,x2,y2、含有 lat=y&lon=x&zoom=z 的 URL 或檔案名稱"
+msgstr ""
+"下載每樣當作原始 gps。可以是 x1,y1,x2,y2、含有 lat=y&lon=x&zoom=z 的 URL 或檔"
+"案名稱"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
@@ -4121,5 +4184,6 @@
 "Add each to the initial selection. Can be a google-like search string or an "
 "URL which returns osm-xml"
-msgstr "加入每一樣到初始選擇區域。可以是 google 式搜尋字串或以 osm-xml 傳回的 URL"
+msgstr ""
+"加入每一樣到初始選擇區域。可以是 google 式搜尋字串或以 osm-xml 傳回的 URL"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
@@ -4268,5 +4332,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
@@ -4275,4 +4339,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
@@ -4428,5 +4493,6 @@
 "relation</strong>.</html>"
 msgstr ""
-"<html>請確認是否從 <strong>1 個關係</strong>中移除 <strong>1 個物件</strong>。</html>"
+"<html>請確認是否從 <strong>1 個關係</strong>中移除 <strong>1 個物件</"
+"strong>。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152
@@ -4437,5 +4503,6 @@
 "relations</strong>.</html>"
 msgstr ""
-"<html>請確認是否從 <strong>{0} 個關係</strong>中移除 <strong>1 個物件</strong>。</html>"
+"<html>請確認是否從 <strong>{0} 個關係</strong>中移除 <strong>1 個物件</"
+"strong>。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156
@@ -4445,5 +4512,6 @@
 "relations</strong>.</html>"
 msgstr ""
-"<html>請確認是否從 <strong>{1} 個關係</strong>中移除 <strong>{0} 個物件</strong>。</html>"
+"<html>請確認是否從 <strong>{1} 個關係</strong>中移除 <strong>{0} 個物件</"
+"strong>。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165
@@ -4474,5 +4542,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
@@ -4493,5 +4561,6 @@
 "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
 "level.</html>"
-msgstr "<html>請以指定的縮放等級選擇一個<strong> OSM 拼貼的範圍</strong>。</html>"
+msgstr ""
+"<html>請以指定的縮放等級選擇一個<strong> OSM 拼貼的範圍</strong>。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
@@ -4511,9 +4580,10 @@
 "<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>"
-msgstr ""
-"<html>或者您也可以輸入<strong>拼貼位址</strong>指定單一拼貼，格式為 <i>zoomlevel/x/y</i>，例如 "
-"<i>15/256/223</i>。拼貼位址的格式如 <i>zoom,x,y</i> 或 <i>zoom;x;y</i> 也是可以使用的。</html>"
+"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"html>"
+msgstr ""
+"<html>或者您也可以輸入<strong>拼貼位址</strong>指定單一拼貼，格式為 "
+"<i>zoomlevel/x/y</i>，例如 <i>15/256/223</i>。拼貼位址的格式如 <i>zoom,x,y</"
+"i> 或 <i>zoom;x;y</i> 也是可以使用的。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
@@ -4543,5 +4613,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"
@@ -4550,5 +4620,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"
@@ -4557,5 +4627,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"
@@ -4767,6 +4837,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 "將他們選取的元件複製到合併元件清單的結尾"
 
@@ -4846,6 +4915,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their "
-"entries.</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr "<html>點選 <strong>{0}</strong> 開始合併我和他們的項目</html>"
 
@@ -4853,6 +4922,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their "
-"entries.</html>"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
+"html>"
 msgstr "<html>點選 <strong>{0}</strong> 結束合併我和他們的項目</html>"
 
@@ -4900,6 +4969,6 @@
 #, java-format
 msgid ""
-"<html>An error occurred while communicating with the server<br>Details: "
-"{0}</html>"
+"<html>An error occurred while communicating with the server<br>Details: {0}</"
+"html>"
 msgstr "<html>與伺服器溝通時發生錯誤<br>詳細資料：{0}</html>"
 
@@ -4926,5 +4995,7 @@
 "There are {0} additional nodes used by way {1}<br>which are deleted on the "
 "server.<br><br>Do you want to undelete these nodes too?"
-msgstr[0] "有 {0} 個額外節點用於<br>在伺服器上刪除的路徑 {1} 。<br><br>您是否也想要取消刪除這個節點？"
+msgstr[0] ""
+"有 {0} 個額外節點用於<br>在伺服器上刪除的路徑 {1} 。<br><br>您是否也想要取消"
+"刪除這個節點？"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525
@@ -4940,5 +5011,7 @@
 "There are {0} additional primitives referred to by relation {1}<br>which are "
 "deleted on the server.<br><br>Do you want to undelete these too?"
-msgstr[0] "有 {0} 個額外原型用於<br>在伺服器上刪除的關係 {1} 。<br><br>您是否也想要取消刪除它？"
+msgstr[0] ""
+"有 {0} 個額外原型用於<br>在伺服器上刪除的關係 {1} 。<br><br>您是否也想要取消"
+"刪除它？"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559
@@ -5049,6 +5122,6 @@
 "you agree?</html>"
 msgstr ""
-"<html>要保留您本地端的版本，JOSM<br>必須將原型 {0} 的 id 重設為 0。<br>在下次上傳時伺服器會重新<br>指派新的 id "
-"給它。<br>您是否同意？</html>"
+"<html>要保留您本地端的版本，JOSM<br>必須將原型 {0} 的 id 重設為 0。<br>在下次"
+"上傳時伺服器會重新<br>指派新的 id 給它。<br>您是否同意？</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
@@ -5069,5 +5142,6 @@
 "<html>JOSM will have to remove your local primitive with id {0}<br>from the "
 "dataset.<br>Do you agree?</html>"
-msgstr "<html>JOSM 即將移除您本地資料組合中 id {0}<br>的原型。<br>您是否同意？</html>"
+msgstr ""
+"<html>JOSM 即將移除您本地資料組合中 id {0}<br>的原型。<br>您是否同意？</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685
@@ -5116,10 +5190,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"
@@ -5128,10 +5204,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
@@ -5213,4 +5291,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 "沒有"
@@ -5372,5 +5451,6 @@
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
-msgstr "<html>輸入標籤數值，例如 <strong><tt>check members</tt></strong></html>"
+msgstr ""
+"<html>輸入標籤數值，例如 <strong><tt>check members</tt></strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
@@ -5383,6 +5463,7 @@
 "place of the original way in the relation.</html>"
 msgstr ""
-"<html>組合的路徑是一或多個關係的成員。請決定您要<strong>保留</strong>組合路徑的這些成員或是<strong>移除</strong>它"
-"們。<br>預設值是<strong>保留</strong>第一條路徑並<strong>移除</strong>相同關係中其他路徑的成員資格：組合後的路徑會取"
+"<html>組合的路徑是一或多個關係的成員。請決定您要<strong>保留</strong>組合路徑"
+"的這些成員或是<strong>移除</strong>它們。<br>預設值是<strong>保留</strong>第"
+"一條路徑並<strong>移除</strong>相同關係中其他路徑的成員資格：組合後的路徑會取"
 "代關係中原本的路徑。</html>"
 
@@ -5396,6 +5477,7 @@
 "the place of the original node in the relation.</html>"
 msgstr ""
-"<html>組合的節點是一或多個關係的成員。請決定您要<strong>保留</strong>目標節點的這些成員或是<strong>移除</strong>它"
-"們。<br>預設值是<strong>保留</strong>第一個節點並<strong>移除</strong>相同關係中其他節點的成員資格：目標節點會取代關"
+"<html>組合的節點是一或多個關係的成員。請決定您要<strong>保留</strong>目標節點"
+"的這些成員或是<strong>移除</strong>它們。<br>預設值是<strong>保留</strong>第"
+"一個節點並<strong>移除</strong>相同關係中其他節點的成員資格：目標節點會取代關"
 "係中原本的節點。</html>"
 
@@ -5430,8 +5512,10 @@
 #: ../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>"
-msgstr "<html>選擇此項以顯示目前選取物件的變更組合。<br>不選擇此項則會顯示目前資料圖層中所有物件的變更組合。</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 ""
+"<html>選擇此項以顯示目前選取物件的變更組合。<br>不選擇此項則會顯示目前資料圖"
+"層中所有物件的變更組合。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
@@ -5455,6 +5539,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 "從 OSM 伺服器下載關於已選取變更組合的資訊"
 
@@ -5500,5 +5583,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
@@ -5571,14 +5654,14 @@
 #, 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>"
-msgstr ""
-"<html>您尚未完成這個衝突中差異的合併。<br>衝突的調解只有在所有差異都<br>解決後才會套用。<br>請按 "
-"<strong>{0}</strong> 強制關閉路徑。<strong>已經<br>解決的差異都不會套用。</strong><br>點選 "
-"<strong>{1}</strong> 則返回衝突調解。</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 ""
+"<html>您尚未完成這個衝突中差異的合併。<br>衝突的調解只有在所有差異都<br>解決"
+"後才會套用。<br>請按 <strong>{0}</strong> 強制關閉路徑。<strong>已經<br>解決"
+"的差異都不會套用。</strong><br>點選 <strong>{1}</strong> 則返回衝突調解。</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
@@ -5600,5 +5683,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
@@ -5606,5 +5689,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 "加入"
@@ -5653,5 +5736,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 "歷史紀錄"
@@ -5871,10 +5954,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 "在關係清單中選擇。"
@@ -6050,6 +6133,6 @@
 "user name<br>in the JOSM preferences.</html>"
 msgstr ""
-"<html>JOSM 目前是以匿名使用者執行。它無法從<br> OSM 伺服器下載您的變更組合，除非在 JOSM 偏好設定<br>輸入您的 OSM "
-"使用者名稱。</html>"
+"<html>JOSM 目前是以匿名使用者執行。它無法從<br> OSM 伺服器下載您的變更組合，"
+"除非在 JOSM 偏好設定<br>輸入您的 OSM 使用者名稱。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:51
@@ -7120,5 +7203,6 @@
 "<html>None of the objects in the content of changeset {0} is available in "
 "the current<br>edit layer ''{1}''.</html>"
-msgstr "<html>在目前編輯圖層「{1}」變更組合 {0} 的內容<br>中沒有物件可用。</html>"
+msgstr ""
+"<html>在目前編輯圖層「{1}」變更組合 {0} 的內容<br>中沒有物件可用。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417
@@ -7288,5 +7372,6 @@
 "<html>Please enter valid date/time values to restrict<br>the query to a "
 "specific time range.</html>"
-msgstr "<html>請輸入有效的日期/時刻數值來將查詢限制<br>在指定的時間範圍。</html>"
+msgstr ""
+"<html>請輸入有效的日期/時刻數值來將查詢限制<br>在指定的時間範圍。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
@@ -7304,5 +7389,7 @@
 "<html>Please enter valid longitude/latitude values to restrict<br>the "
 "changeset query to a specific bounding box.</html>"
-msgstr "<html>請輸入有效的經度 /緯度數值來將變更組合查詢<br>限制在指定的綁定方塊。</html>"
+msgstr ""
+"<html>請輸入有效的經度 /緯度數值來將變更組合查詢<br>限制在指定的綁定方塊。</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
@@ -7320,5 +7407,6 @@
 "<html>The  current value is not a valid user name.<br>Please enter an non-"
 "empty user name.</html>"
-msgstr "<html>目前的數值不是有效的使用者名稱。<br>請輸入非空白的使用者名稱。</html>"
+msgstr ""
+"<html>目前的數值不是有效的使用者名稱。<br>請輸入非空白的使用者名稱。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
@@ -7329,7 +7417,9 @@
 #, 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>"
-msgstr "請以您所在地區常用的格式輸入日期。<br>範例：{0}<br>範例：{1}<br>範例：{2}<br>範例：{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 ""
+"請以您所在地區常用的格式輸入日期。<br>範例：{0}<br>範例：{1}<br>範例：{2}<br>"
+"範例：{3}<br>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1127
@@ -7338,5 +7428,7 @@
 "Please enter a valid time in the usual format for your locale.<br>Example: "
 "{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr "請以您所在地區常用的格式輸入有效的時刻。<br>範例：{0}<br>範例：{1}<br>範例：{2}<br>範例：{3}<br>"
+msgstr ""
+"請以您所在地區常用的格式輸入有效的時刻。<br>範例：{0}<br>範例：{1}<br>範例："
+"{2}<br>範例：{3}<br>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:108
@@ -7348,15 +7440,17 @@
 "<html>Select to restrict the query to your changesets only.<br>Unselect to "
 "include all changesets in the query.</html>"
-msgstr "<html>選擇只查詢您的變更組合。<br>不選擇這項就會查詢所有的變更組合。</html>"
+msgstr ""
+"<html>選擇只查詢您的變更組合。<br>不選擇這項就會查詢所有的變更組合。</html>"
 
 #: ../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>"
-msgstr ""
-"<html>請在下列<strong>標準查詢</strong>中選擇一項。如果您只想下載由自己建立的變更組合，請選擇<strong>只下載我的變更組合</"
-"strong>。<br>注意 JOSM 最多只能下載 100 個變更組合。</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 ""
+"<html>請在下列<strong>標準查詢</strong>中選擇一項。如果您只想下載由自己建立的"
+"變更組合，請選擇<strong>只下載我的變更組合</strong>。<br>注意 JOSM 最多只能下"
+"載 100 個變更組合。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:147
@@ -7368,5 +7462,7 @@
 "<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
 "user name in the preferences first.</em></html>"
-msgstr "<html>下載我的開放變更組合<br><em>已停用。請先在偏好設定中輸入您的 OSM 使用者名稱。</em></html>"
+msgstr ""
+"<html>下載我的開放變更組合<br><em>已停用。請先在偏好設定中輸入您的 OSM 使用者"
+"名稱。</em></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:157
@@ -7378,5 +7474,7 @@
 "<html>Download changesets in the current map view.<br><em>Disabled. There is "
 "currently no map view active.</em></html>"
-msgstr "<html>下載在目前地圖檢視中的變更組合。<br><em>已停用。目前並沒有使用中的地圖檢視。</em></html>"
+msgstr ""
+"<html>下載在目前地圖檢視中的變更組合。<br><em>已停用。目前並沒有使用中的地圖"
+"檢視。</em></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:168
@@ -7469,5 +7567,7 @@
 "Note that changeset queries are currently always submitted to ''{0}'', "
 "regardless of the host, port and path of the URL entered below."
-msgstr "請注意變更組合查詢目前永遠送出到「{0}」，不管下列輸入的 URL 路徑、主機和連接埠。"
+msgstr ""
+"請注意變更組合查詢目前永遠送出到「{0}」，不管下列輸入的 URL 路徑、主機和連接"
+"埠。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:174
@@ -7475,9 +7575,9 @@
 msgstr "這個變更組合查詢 URL 是無效的"
 
-#: ../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."
@@ -7485,23 +7585,23 @@
 msgstr[0] "這會改變 {0} 個物件。"
 
-#: ../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 "<不同>"
 
-#: ../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 "是否改變數值？"
 
-#: ../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"
@@ -7509,5 +7609,5 @@
 msgstr[0] "改變屬性至 {0} 個物件"
 
-#: ../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."
@@ -7515,77 +7615,77 @@
 msgstr[0] "這會改變 {0} 個物件。"
 
-#: ../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 "請選擇一個設定鍵"
 
-#: ../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 "請選擇一個數值"
 
-#: ../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 "屬性/成員"
 
-#: ../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 "選取物件的屬性。"
 
 #. 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 "屬性：{0} / 成員：{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 "屬性 / 成員"
 
-#: ../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 "改變關係"
 
-#: ../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 "確定要刪除關係 {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 "刪除所有物件中選取的設定鍵"
 
-#: ../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 "將新的設定鍵/數值配對加入到所有的物件"
 
-#: ../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 "編輯所有物件選取設定鍵的數值"
 
-#: ../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 "選擇主要選擇區域的關係。"
@@ -7697,9 +7797,9 @@
 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>"
-msgstr ""
-"<html>在這個關係中至少有一個成員參照到<br>這個關係自身。<br>這樣會建立循環相依關係，但是不建議這麼做。<br>您要如何處理循環相依關係？</"
-"html>"
+"relation itself.<br>This creates circular dependencies and is discouraged."
+"<br>How do you want to proceed with circular dependencies?</html>"
+msgstr ""
+"<html>在這個關係中至少有一個成員參照到<br>這個關係自身。<br>這樣會建立循環相"
+"依關係，但是不建議這麼做。<br>您要如何處理循環相依關係？</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
@@ -7716,7 +7816,9 @@
 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>"
-msgstr "<html>這個關係已經有一或多個成員參照到<br>原型「{0}」<br><br>您確定要加入另一個關係成員嗎？</html>"
+"primitive ''{0}''<br><br>Do you really want to add another relation member?</"
+"html>"
+msgstr ""
+"<html>這個關係已經有一或多個成員參照到<br>原型「{0}」<br><br>您確定要加入另一"
+"個關係成員嗎？</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612
@@ -7730,5 +7832,7 @@
 "circular references and is therefore discouraged.<br>Skipping relation "
 "''{0}''.</html>"
-msgstr "<html>您正試著將關係加入它自己。<br><br>這樣會建立循環參照，因此不建議這麼做。<br>正略過關係「{0}」。</html>"
+msgstr ""
+"<html>您正試著將關係加入它自己。<br><br>這樣會建立循環參照，因此不建議這麼"
+"做。<br>正略過關係「{0}」。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671
@@ -7868,13 +7972,15 @@
 "conflict and close the editor?</html>"
 msgstr ""
-"<html>這個關係已經在此編輯器以外的地方被改變了。<br>您不能套用自己的變更後繼續編輯。<br><br>是否要建立衝突並關閉編輯器？</html>"
+"<html>這個關係已經在此編輯器以外的地方被改變了。<br>您不能套用自己的變更後繼"
+"續編輯。<br><br>是否要建立衝突並關閉編輯器？</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
 #, java-format
 msgid ""
-"<html>Layer ''{0}'' already has a conflict for "
-"primitive<br>''{1}''.<br>Please resolve this conflict first, then try "
-"again.</html>"
-msgstr "<html>圖層「{0}」已經有衝突於原型<br>「{1}」。<br>請先調解這個衝突，然後再試一次。</html>"
+"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
+"<br>Please resolve this conflict first, then try again.</html>"
+msgstr ""
+"<html>圖層「{0}」已經有衝突於原型<br>「{1}」。<br>請先調解這個衝突，然後再試"
+"一次。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
@@ -8064,5 +8170,7 @@
 "<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
 "maxlat): </html>"
-msgstr "<html><strong>目前的下載區域</strong> (最小經度, 最小緯度, 最大經度, 最大緯度): </html>"
+msgstr ""
+"<html><strong>目前的下載區域</strong> (最小經度, 最小緯度, 最大經度, 最大緯"
+"度): </html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
@@ -8175,5 +8283,7 @@
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
-msgstr "<html>選擇以將資料下載到新的資料圖層。<br>不選擇則會下載到目前使用中的資料圖層。</html>"
+msgstr ""
+"<html>選擇以將資料下載到新的資料圖層。<br>不選擇則會下載到目前使用中的資料圖"
+"層。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219
@@ -8204,10 +8314,9 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is "
-"enabled.<br>Please chose to either download OSM data, or GPX data, or "
-"both.</html>"
-msgstr ""
-"<html>不論 <strong>{0}</strong> 或 <strong>{1}</strong> 都沒有啟用。<br>請選擇下載 OSM "
-"資料，或 GPX 資料，或兩個都選。</html>"
+"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
+"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
+msgstr ""
+"<html>不論 <strong>{0}</strong> 或 <strong>{1}</strong> 都沒有啟用。<br>請選"
+"擇下載 OSM 資料，或 GPX 資料，或兩個都選。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
@@ -8347,11 +8456,12 @@
 "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 ""
 "<html><p class=\"warning-header\">缺少求助主題的內容</p><p class=\"warning-"
 "body\">求助主題的內容<strong>{0}</strong>尚不能取得。不管是您當地語言 ({1}) "
-"或是英語版本都沒有。<br><br>請協助改進 JOSM 求助系統並填好缺少的資訊。您可以編輯<a href=\"{2}\">將求助主題編輯為當地的語言 "
-"({1})</a> 和 <a href=\"{3}\">英語版本</a>。</p></html>"
+"或是英語版本都沒有。<br><br>請協助改進 JOSM 求助系統並填好缺少的資訊。您可以"
+"編輯<a href=\"{2}\">將求助主題編輯為當地的語言 ({1})</a> 和 <a href=\"{3}\">"
+"英語版本</a>。</p></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
@@ -8360,10 +8470,10 @@
 "<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 ""
 "<html><p class=\"error-header\">在取得求助資訊時發生錯誤</p><p class=\"error-"
-"body\">無法載入求助主題 <strong>{0}</strong> 的內容。錯誤訊息為 "
-"(未經翻譯)：<br><tt>{1}</tt></p></html>"
+"body\">無法載入求助主題 <strong>{0}</strong> 的內容。錯誤訊息為 (未經翻譯)："
+"<br><tt>{1}</tt></p></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355
@@ -8372,5 +8482,7 @@
 "<html>Failed to open help page for url {0}.<br>This is most likely due to a "
 "network problem, please check<br>your internet connection</html>"
-msgstr "<html>無法開啟 url {0} 的求助頁面。<br>這大部分是網路問題造成的，請檢查<br>您的網際網路連線</html>"
+msgstr ""
+"<html>無法開啟 url {0} 的求助頁面。<br>這大部分是網路問題造成的，請檢查<br>您"
+"的網際網路連線</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360
@@ -8394,6 +8506,6 @@
 "possible for help topics<br>on the help server <tt>{1}</tt>.</html>"
 msgstr ""
-"<html>目前的 URL <tt>{0}</tt><br>是外部 URL。編輯求助主題只能在<br>求助伺服器 <tt>{1}</tt> "
-"進行。</html>"
+"<html>目前的 URL <tt>{0}</tt><br>是外部 URL。編輯求助主題只能在<br>求助伺服"
+"器 <tt>{1}</tt> 進行。</html>"
 
 #. putValue(NAME, tr("Reload"));
@@ -8638,14 +8750,14 @@
 "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>"
-msgstr ""
-"<html>上傳<strong>失敗</strong>，因為伺服器上的節點、<br>路徑或關係比您的版本更新。<br>這個衝突是由於 "
-"<strong>{0}</strong> ( id <strong>{1}</strong>) 造成，<br>伺服器的版本為 {2}，您的版本為 "
-"{3}。<br><br>請點選 <strong>{4}</strong> 只同步有衝突的原型。<br>點選 <strong>{5}</strong> "
-"會與伺服器同步整個本地端資料組合。<br>點選 <strong>{6}</strong> 則會放棄並繼續編輯。<br></html>"
+"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
+"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
+"strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{6}</strong> to abort and continue editing.<br></html>"
+msgstr ""
+"<html>上傳<strong>失敗</strong>，因為伺服器上的節點、<br>路徑或關係比您的版本"
+"更新。<br>這個衝突是由於 <strong>{0}</strong> ( id <strong>{1}</strong>) 造"
+"成，<br>伺服器的版本為 {2}，您的版本為 {3}。<br><br>請點選 <strong>{4}</"
+"strong> 只同步有衝突的原型。<br>點選 <strong>{5}</strong> 會與伺服器同步整個"
+"本地端資料組合。<br>點選 <strong>{6}</strong> 則會放棄並繼續編輯。<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
@@ -8659,11 +8771,11 @@
 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>"
-msgstr ""
-"<html>上傳<strong>失敗</strong>，因為伺服器已有您的節點、路徑或關係<br>的新版本。<br><br>請按<strong>{0}</"
-"strong>將整個本地端資料組與伺服器同步。<br>按<strong>{1}</strong>則會放棄並繼續編輯。<br></html>"
+"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
+"</strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{1}</strong> to abort and continue editing.<br></html>"
+msgstr ""
+"<html>上傳<strong>失敗</strong>，因為伺服器已有您的節點、路徑或關係<br>的新版"
+"本。<br><br>請按<strong>{0}</strong>將整個本地端資料組與伺服器同步。<br>按"
+"<strong>{1}</strong>則會放棄並繼續編輯。<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194
@@ -8674,6 +8786,6 @@
 "again with a new or an existing open changeset.</html>"
 msgstr ""
-"<html>上傳 <strong>失敗</strong>，因為您使用的<br>變更組合 {0} 已經在 {1} "
-"被關閉了。<br>請以新的或已開啟的變更組合再上傳一次。</html>"
+"<html>上傳 <strong>失敗</strong>，因為您使用的<br>變更組合 {0} 已經在 {1} 被"
+"關閉了。<br>請以新的或已開啟的變更組合再上傳一次。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202
@@ -8702,7 +8814,7 @@
 "conflicts which you can resolve in the Conflict Resolution Dialog.</html>"
 msgstr ""
-"<html>上傳 <strong>已失敗</strong>，因為您嘗試刪除的節點 {0} 仍被路徑 {1} 使用中。<br><br>請點選 "
-"<strong>{2}</strong> 以下載節點 {0} 的所有上層路徑。<br>如果有需要 JOSM "
-"會建立衝突項目讓您可以在衝突解決對話盒中處理它。</html>"
+"<html>上傳 <strong>已失敗</strong>，因為您嘗試刪除的節點 {0} 仍被路徑 {1} 使"
+"用中。<br><br>請點選 <strong>{2}</strong> 以下載節點 {0} 的所有上層路徑。<br>"
+"如果有需要 JOSM 會建立衝突項目讓您可以在衝突解決對話盒中處理它。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237
@@ -8863,5 +8975,7 @@
 "Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid "
 "username and a valid password."
-msgstr "<html>在 HTTP 代理伺服器「{0}」驗證失敗。請輸入有效的使用者名稱和密碼。</html>"
+msgstr ""
+"<html>在 HTTP 代理伺服器「{0}」驗證失敗。請輸入有效的使用者名稱和密碼。</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259
@@ -8869,5 +8983,7 @@
 "Warning: depending on the authentication method the proxy server uses the "
 "password may be transferred unencrypted."
-msgstr "<html>警告：根據此代理伺服器所使用的驗證方式，密碼可能是以未加密的方式傳輸。</html>"
+msgstr ""
+"<html>警告：根據此代理伺服器所使用的驗證方式，密碼可能是以未加密的方式傳輸。"
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279
@@ -8913,5 +9029,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 "否"
@@ -8919,6 +9035,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 "圖層「{0}」已被修改，應上傳至伺服器。"
 
@@ -8989,5 +9104,7 @@
 "<html>{0} layers have unresolved conflicts.<br>Either resolve them first or "
 "discard the modifications.<br>Layers with conflicts:</html>"
-msgstr[0] "<html>{0} 個圖層有未解決的衝突。<br>請先調解它或放棄這個修改。<br>有衝突的圖層：</html>"
+msgstr[0] ""
+"<html>{0} 個圖層有未解決的衝突。<br>請先調解它或放棄這個修改。<br>有衝突的圖"
+"層：</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
@@ -9002,7 +9119,9 @@
 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>"
-msgstr[0] "<html>{0} 個圖層需要儲存卻沒有關聯的檔案。<br>請先選擇一個檔案或放棄這個修改。<br>沒有檔案的圖層：</html>"
+"file for each of them or discard the changes.<br>Layers without a file:</"
+"html>"
+msgstr[0] ""
+"<html>{0} 個圖層需要儲存卻沒有關聯的檔案。<br>請先選擇一個檔案或放棄這個修"
+"改。<br>沒有檔案的圖層：</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
@@ -9014,6 +9133,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 "
@@ -9021,5 +9140,6 @@
 "changes.<br>Layers with non-writable files:</html>"
 msgstr[0] ""
-"<html>{0} 個圖層需要儲存但是關聯的檔案<br>卻不能寫入。<br>請選擇另一個檔案或放棄這個修改。<br>無法寫入檔案的圖層：</html>"
+"<html>{0} 個圖層需要儲存但是關聯的檔案<br>卻不能寫入。<br>請選擇另一個檔案或"
+"放棄這個修改。<br>無法寫入檔案的圖層：</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
@@ -9076,5 +9196,7 @@
 "<html>Upload and/or save operations of {0} layers with modifications<br>were "
 "cancelled or have failed.</html>"
-msgstr[0] "<html>上傳和/或儲存的選項，用於 {0} 個修改過的圖層<br>被取消或有錯誤時。</html>"
+msgstr[0] ""
+"<html>上傳和/或儲存的選項，用於 {0} 個修改過的圖層<br>被取消或有錯誤時。</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500
@@ -9238,5 +9360,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9262,6 +9384,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 "這個變更組合在這次上傳後會<strong>關閉</strong>"
 
@@ -9279,5 +9400,6 @@
 msgid_plural ""
 "Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong>"
-msgstr[0] "正在上傳 <strong>{0} 個物件</strong>到 <strong>1 個變更組合</strong>"
+msgstr[0] ""
+"正在上傳 <strong>{0} 個物件</strong>到 <strong>1 個變更組合</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:87
@@ -9290,6 +9412,6 @@
 "<strong>1 request</strong>"
 msgstr[0] ""
-"正在使用 <strong>1 次要求</strong>上傳 <strong>{0} 個物件</strong>到 <strong>1 "
-"個變更組合</strong>"
+"正在使用 <strong>1 次要求</strong>上傳 <strong>{0} 個物件</strong>到 "
+"<strong>1 個變更組合</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:92
@@ -9299,6 +9421,6 @@
 "<strong>{1} requests</strong>"
 msgstr ""
-"正在使用 <strong>{1} 次要求</strong>上傳 <strong>{0} 個物件</strong>到 <strong>1 "
-"個變更組合</strong>"
+"正在使用 <strong>{1} 次要求</strong>上傳 <strong>{0} 個物件</strong>到 "
+"<strong>1 個變更組合</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:94
@@ -9314,15 +9436,15 @@
 "proceed with <strong>multiple changesets</strong>"
 msgstr ""
-"{0} 個物件超過伺服器「{2}」變更組合最多允許的 {1} 個物件。請 <a href=\"urn:advanced-"
-"configuration\">設定</a>如何處理<strong>多個變更組合</strong>"
+"{0} 個物件超過伺服器「{2}」變更組合最多允許的 {1} 個物件。請 <a href=\"urn:"
+"advanced-configuration\">設定</a>如何處理<strong>多個變更組合</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:101
 #, java-format
 msgid ""
-"Uploading <strong>{0} objects</strong> to <strong>multiple "
-"changesets</strong> using <strong>{1} requests</strong>"
-msgstr ""
-"正在使用 <strong>{1} 次要求</strong>上傳 <strong>{0} "
-"個物件</strong>到<strong>多個變更組合</strong>"
+"Uploading <strong>{0} objects</strong> to <strong>multiple changesets</"
+"strong> using <strong>{1} requests</strong>"
+msgstr ""
+"正在使用 <strong>{1} 次要求</strong>上傳 <strong>{0} 個物件</strong>到"
+"<strong>多個變更組合</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:67
@@ -9362,5 +9484,7 @@
 "likely because the changesets size exceeded the max. size<br>of {0} objects "
 "on the server ''{1}''."
-msgstr "伺服器回報目前的變更組合已關閉。<br>這很可能是由於變更組合的大小超過<br>伺服器「{1}」最大 {0} 個物件的大小。"
+msgstr ""
+"伺服器回報目前的變更組合已關閉。<br>這很可能是由於變更組合的大小超過<br>伺服"
+"器「{1}」最大 {0} 個物件的大小。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:107
@@ -9374,10 +9498,11 @@
 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>"
-msgstr ""
-"點選「<strong>{0}</strong>」繼續上傳到另外的新變更組合。<br>點選「<strong>{1}</strong>」回到上傳對話盒。<br"
-">點選「<strong>{2}</strong>」放棄上傳並回到地圖編輯。<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 ""
+"點選「<strong>{0}</strong>」繼續上傳到另外的新變更組合。<br>點選「<strong>{1}"
+"</strong>」回到上傳對話盒。<br>點選「<strong>{2}</strong>」放棄上傳並回到地圖"
+"編輯。<br>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:124
@@ -9386,5 +9511,5 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9392,5 +9517,6 @@
 "Warning: object ''{0}'' is already deleted on the server. Skipping this "
 "object and retrying to upload."
-msgstr "警告：物件「{0}」已經在伺服器端被刪除了。現在略過這個物件並重新嘗試上傳。"
+msgstr ""
+"警告：物件「{0}」已經在伺服器端被刪除了。現在略過這個物件並重新嘗試上傳。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195
@@ -9400,5 +9526,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..."
@@ -9408,6 +9534,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 "忽略捕捉到的例外，因為上傳已被取消。例外為：{0}"
 
@@ -9416,5 +9541,6 @@
 "<html>Mark modified objects <strong>from the current selection</strong> to "
 "be uploaded to the server.</html>"
-msgstr "<html><strong>從目前的選擇區域</strong>標記修改過的物件上傳到伺服器。</html>"
+msgstr ""
+"<html><strong>從目前的選擇區域</strong>標記修改過的物件上傳到伺服器。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:70
@@ -9459,5 +9585,7 @@
 "<html>There are <strong>multiple changesets</strong> necessary in order to "
 "upload {0} objects. Which strategy do you want to use?</html>"
-msgstr "<html>需要<strong>多個變更組合</strong>才能上傳 {0} 個物件。您想要使用哪種方式？</html>"
+msgstr ""
+"<html>需要<strong>多個變更組合</strong>才能上傳 {0} 個物件。您想要使用哪種方"
+"式？</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191
@@ -9478,5 +9606,7 @@
 "<html>Cannot upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
-msgstr "<html>不能以一次要求上傳 {0} 個物件，因為超過了伺服器「{2}」<br>的最大變更組合大小 {1}。</html>"
+msgstr ""
+"<html>不能以一次要求上傳 {0} 個物件，因為超過了伺服器「{2}」<br>的最大變更組"
+"合大小 {1}。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
@@ -9485,5 +9615,7 @@
 "<html>There are <strong>multiple changesets</strong> necessary in order to "
 "upload {0} objects. What strategy do you want to use?</html>"
-msgstr "<html>需要<strong>多個變更組合</strong>才能上傳 {0} 個物件。您想要使用哪種方式？</html>"
+msgstr ""
+"<html>需要<strong>多個變更組合</strong>才能上傳 {0} 個物件。您想要使用哪種方"
+"式？</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351
@@ -9621,9 +9753,10 @@
 #, 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>"
-msgstr ""
-"<html>GPX 圖層「{0}」中的資料已從伺服器下載。<br>因為它的航點並不包含時間戳記，我們不能將它們與聲音資料關聯。</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 ""
+"<html>GPX 圖層「{0}」中的資料已從伺服器下載。<br>因為它的航點並不包含時間戳"
+"記，我們不能將它們與聲音資料關聯。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
@@ -9648,8 +9781,10 @@
 #, 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>"
-msgstr "<html>GPX 圖層「{0}」中的資料已從伺服器下載。<br>因為它的航點並不包含時間戳記，我們不能將它們與照片關聯。</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 ""
+"<html>GPX 圖層「{0}」中的資料已從伺服器下載。<br>因為它的航點並不包含時間戳"
+"記，我們不能將它們與照片關聯。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
@@ -9709,7 +9844,9 @@
 #: ../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:"
-msgstr "<html>上傳未經處理的 GPS 資料做為地圖資料被認為是有壞處的。<br>如果您想要上傳軌跡，請看這裡："
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>上傳未經處理的 GPS 資料做為地圖資料被認為是有壞處的。<br>如果您想要上傳"
+"軌跡，請看這裡："
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
@@ -9772,5 +9909,6 @@
 "<html>This action will require {0} individual<br>download requests. Do you "
 "wish<br>to continue?</html>"
-msgstr "<html>這個動作會發出 {0} 個<br>個別的下載要求。您是否希望<br>繼續？</html>"
+msgstr ""
+"<html>這個動作會發出 {0} 個<br>個別的下載要求。您是否希望<br>繼續？</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
@@ -9824,5 +9962,6 @@
 "server."
 msgstr[0] ""
-"{0} 衝突已經以清除本地資料組合 {0} 物件的方式<strong>自動調解</strong> <br>了。因為它已經從伺服器上刪除了。"
+"{0} 衝突已經以清除本地資料組合 {0} 物件的方式<strong>自動調解</strong> <br>"
+"了。因為它已經從伺服器上刪除了。"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
@@ -9881,7 +10020,9 @@
 #: ../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>"
-msgstr "<html>上傳未經處理的 GPS 資料當作地圖資料是不適當的。<br>如果您想要上傳軌跡，請看這裡：</html>"
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:</html>"
+msgstr ""
+"<html>上傳未經處理的 GPS 資料當作地圖資料是不適當的。<br>如果您想要上傳軌跡，"
+"請看這裡：</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
@@ -9935,9 +10076,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
 msgid ""
-"<html>Take a photo of your GPS receiver while it displays the "
-"time.<br>Display that photo here.<br>And then, simply capture the time you "
-"read on the photo and select a timezone<hr></html>"
-msgstr ""
-"<html>配合您的 GPS 接收器拍照，它會顯示時刻。<br>在這裡顯示照片。<br>然後，根據您讀取到的相片時刻並選擇時區<hr></html>"
+"<html>Take a photo of your GPS receiver while it displays the time."
+"<br>Display that photo here.<br>And then, simply capture the time you read "
+"on the photo and select a timezone<hr></html>"
+msgstr ""
+"<html>配合您的 GPS 接收器拍照，它會顯示時刻。<br>在這裡顯示照片。<br>然後，根"
+"據您讀取到的相片時刻並選擇時區<hr></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
@@ -10225,5 +10367,6 @@
 "<html><h3>Delete the file {0} from disk?<p>The image file will be "
 "permanently lost!</h3></html>"
-msgstr "<html><h3>是否從磁碟刪除檔案 {0}？<p>這個照片檔案會永久消失！</h3></html>"
+msgstr ""
+"<html><h3>是否從磁碟刪除檔案 {0}？<p>這個照片檔案會永久消失！</h3></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
@@ -10388,5 +10531,6 @@
 "You need to drag the play head near to the GPX track whose associated sound "
 "track you were playing (after the first marker)."
-msgstr "您需要播放開頭拖放到要與播放的聲音軌關聯的 GPX 軌跡附近（在第一個標記之後）。"
+msgstr ""
+"您需要播放開頭拖放到要與播放的聲音軌關聯的 GPX 軌跡附近（在第一個標記之後）。"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:225
@@ -10452,5 +10596,7 @@
 "<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
 "to use the Access Token in this JOSM session only.</html>"
-msgstr "<html>選擇將存取記號儲存到 JOSM 偏好設定中。<br>取消選取則只會在這個 JOSM 作業階段使用存取記號。</html>"
+msgstr ""
+"<html>選擇將存取記號儲存到 JOSM 偏好設定中。<br>取消選取則只會在這個 JOSM 作"
+"業階段使用存取記號。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
@@ -10491,5 +10637,7 @@
 "<html>JOSM is about to reset the OAuth settings to default values.<br>The "
 "current custom settings are not saved.</html>"
-msgstr "<html>JOSM 即將把 OAuth 設定值重設為預設值。<br>目前自訂的設定值不會儲存。</html>"
+msgstr ""
+"<html>JOSM 即將把 OAuth 設定值重設為預設值。<br>目前自訂的設定值不會儲存。</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
@@ -10513,9 +10661,9 @@
 "<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>"
-msgstr ""
-"<html>執行全自動的程序自 OSM 網站取得存取記號。<br>JOSM 會代表 JOSM 使用者存取 OSM "
-"網站並且全自動<br>驗證使用者以取得存取記號。</html>"
+"fully<br>automatically authorizes the user and retrieves an Access Token.</"
+"html>"
+msgstr ""
+"<html>執行全自動的程序自 OSM 網站取得存取記號。<br>JOSM 會代表 JOSM 使用者存"
+"取 OSM 網站並且全自動<br>驗證使用者以取得存取記號。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:80
@@ -10532,15 +10680,17 @@
 "<html>Enter an Access Token manually if it was generated and retrieved "
 "outside<br>of JOSM.</html>"
-msgstr "<html>如果您是在 JOSM 之外產生並取得存取記號的話，<br>請手動輸入它。</html>"
+msgstr ""
+"<html>如果您是在 JOSM 之外產生並取得存取記號的話，<br>請手動輸入它。</html>"
 
 #: ../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."
-msgstr ""
-"請輸入您的 OSM 使用者名稱和密碼。密碼將<strong>不會</strong>以明文的方式儲存在 JOSM 偏好設定，同時它也只會傳送到 OSM "
-"伺服器<strong>一次</strong>。往後的資料上傳要求不會再使用您的密碼。"
+"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 ""
+"請輸入您的 OSM 使用者名稱和密碼。密碼將<strong>不會</strong>以明文的方式儲存"
+"在 JOSM 偏好設定，同時它也只會傳送到 OSM 伺服器<strong>一次</strong>。往後的"
+"資料上傳要求不會再使用您的密碼。"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:111
@@ -10561,6 +10711,6 @@
 "(HTTPS)."
 msgstr ""
-"<strong>警告：</strong>密碼會有<strong>一次</strong>以明文傳送到 OSM 網站。直到 OSM 伺服器提供加密通訊頻道 "
-"(HTTPS) 前<strong>不要</strong>使用重要的密碼。"
+"<strong>警告：</strong>密碼會有<strong>一次</strong>以明文傳送到 OSM 網站。直"
+"到 OSM 伺服器提供加密通訊頻道 (HTTPS) 前<strong>不要</strong>使用重要的密碼。"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:173
@@ -10584,6 +10734,6 @@
 "in subsequent requests to gain access to the OSM API.</html>"
 msgstr ""
-"<html>您已經成功的從 OSM 網站取回 OAuth 存取記號。請按 <strong>{0}</strong> 套用這個記號。JOSM "
-"會在往後的要求中使用它存取 OSM API。</html>"
+"<html>您已經成功的從 OSM 網站取回 OAuth 存取記號。請按 <strong>{0}</strong> "
+"套用這個記號。JOSM 會在往後的要求中使用它存取 OSM API。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:329
@@ -10643,6 +10793,6 @@
 "authorization process,<br>i.e. semi-automatic or manual authorization.</html>"
 msgstr ""
-"<html>從 OSM 伺服器自動取得 OAuth "
-"存取記號的<br>程序失敗了。<br><br>請再試一次或選擇別種授權程序，<br>例如：半自動成手動授權。</html>"
+"<html>從 OSM 伺服器自動取得 OAuth 存取記號的<br>程序失敗了。<br><br>請再試一"
+"次或選擇別種授權程序，<br>例如：半自動成手動授權。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:458
@@ -10665,9 +10815,9 @@
 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>"
-msgstr ""
-"<html>從 OSM 伺服器自動取得 OAuth 存取記號的程序<br>失敗。JOSM 無法登入 "
-"{0}<br>使用者：{1}。<br><br>請檢查使用者名稱和密碼後再試一次。</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 ""
+"<html>從 OSM 伺服器自動取得 OAuth 存取記號的程序<br>失敗。JOSM 無法登入 {0}"
+"<br>使用者：{1}。<br><br>請檢查使用者名稱和密碼後再試一次。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:58
@@ -10703,5 +10853,6 @@
 "<html><body>Please enter an OAuth Access Token which is authorized to access "
 "the OSM server ''{0}''.</body></html>"
-msgstr "<html><body>請輸入授權存取 OSM 伺服器「{0}」的 OAuth 存取記號。</body></html>"
+msgstr ""
+"<html><body>請輸入授權存取 OSM 伺服器「{0}」的 OAuth 存取記號。</body></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:177
@@ -10735,5 +10886,6 @@
 "your behalf (<a href=\"{0}\">more info...</a>)."
 msgstr ""
-"使用 OAuth 您會得到以自己的身分在 JOSM 上傳地圖資料和 GPS 軌跡的權限 (<a href=\"{0}\">更多資訊...</a>)。"
+"使用 OAuth 您會得到以自己的身分在 JOSM 上傳地圖資料和 GPS 軌跡的權限 (<a "
+"href=\"{0}\">更多資訊...</a>)。"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:126
@@ -10777,6 +10929,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 "無法以使用者「{0}」密碼「***」驗證為 OAuth 使用者"
 
@@ -10890,5 +11041,6 @@
 "<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
 "Token from ''{1}''.</html>"
-msgstr "<html>請點選 <strong>{0}</strong> 從「{1}」取回 OAuth 要求記號。</html>"
+msgstr ""
+"<html>請點選 <strong>{0}</strong> 從「{1}」取回 OAuth 要求記號。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:182
@@ -10910,12 +11062,13 @@
 "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>"
-msgstr ""
-"<html>JOSM 成功的取回要求記號。JOSM 現在會在外部瀏覽器中開啟驗證網頁。請以您的 OSM "
-"使用者名稱和密碼登入並按照指示授權給要求記號。接著切換回這個對話盒並點選 "
-"<strong>{0}</strong><br><br>如果執行外部瀏覽器失敗，您可以複製下列驗證 URL 並將它貼到瀏覽器的位址列中。</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 ""
+"<html>JOSM 成功的取回要求記號。JOSM 現在會在外部瀏覽器中開啟驗證網頁。請以您"
+"的 OSM 使用者名稱和密碼登入並按照指示授權給要求記號。接著切換回這個對話盒並點"
+"選 <strong>{0}</strong><br><br>如果執行外部瀏覽器失敗，您可以複製下列驗證 "
+"URL 並將它貼到瀏覽器的位址列中。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:275
@@ -10934,6 +11087,6 @@
 "authorization to the OSM server.<br><br>The access token is: </html>"
 msgstr ""
-"<html>JOSM 已成功的取回存取記號。您現在可以套用這個記號。JOSM 往後會用它進行與 OSM "
-"伺服器的驗證。<br><br>存取記號為：</html>"
+"<html>JOSM 已成功的取回存取記號。您現在可以套用這個記號。JOSM 往後會用它進行"
+"與 OSM 伺服器的驗證。<br><br>存取記號為：</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:348
@@ -10974,6 +11127,6 @@
 "''{3}''.</html>"
 msgstr ""
-"<html>成功的使用存取記號「{0}」存取<br>OSM 伺服器「{1}」。<br>您現在是以使用者「{2}」id「{3}」存取 OSM "
-"伺服器。</html>"
+"<html>成功的使用存取記號「{0}」存取<br>OSM 伺服器「{1}」。<br>您現在是以使用"
+"者「{2}」id「{3}」存取 OSM 伺服器。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
@@ -10989,7 +11142,6 @@
 "token.</html>"
 msgstr ""
-"<html>無法存取 OSM "
-"伺服器「{0}」<br>存取記號為「{0}」。<br>伺服器將存取記號視為未授權而拒絕。您將<br>無法使用這個記號存取伺服器上任何受保護的資源。</ht"
-"ml>"
+"<html>無法存取 OSM 伺服器「{0}」<br>存取記號為「{0}」。<br>伺服器將存取記號視"
+"為未授權而拒絕。您將<br>無法使用這個記號存取伺服器上任何受保護的資源。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172
@@ -11004,12 +11156,12 @@
 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>"
-msgstr ""
-"<html>存取記號「{1}」是用於 OSM "
-"伺服器「{0}」。<br>然而，以這個記號測試取回使用者詳細資料卻失敗了。<br>依據這個記號獲得的權限您仍有可能使用它<br>上傳資料、 GPS "
-"軌跡和/或存取其他受保護的資源。</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 ""
+"<html>存取記號「{1}」是用於 OSM 伺服器「{0}」。<br>然而，以這個記號測試取回使"
+"用者詳細資料卻失敗了。<br>依據這個記號獲得的權限您仍有可能使用它<br>上傳資"
+"料、 GPS 軌跡和/或存取其他受保護的資源。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
@@ -11025,7 +11177,7 @@
 "Carefully check the server<br>URL and your Internet connection.</html>"
 msgstr ""
-"<html>無法從 OSM "
-"伺服器「{0}」取回關於目前使用者的資訊。<br>這可能是測試的存取記號造成的問題，但<br>也可能是否應伺服器組態的問題。請小心檢查伺服器<br>URL"
-" 和您的網際網路連線。</html>"
+"<html>無法從 OSM 伺服器「{0}」取回關於目前使用者的資訊。<br>這可能是測試的存"
+"取記號造成的問題，但<br>也可能是否應伺服器組態的問題。請小心檢查伺服器"
+"<br>URL 和您的網際網路連線。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
@@ -11034,12 +11186,16 @@
 "<html>Failed to sign the request for the OSM server ''{0}'' with the token "
 "''{1}''.<br>The token ist probably invalid.</html>"
-msgstr "<html>無法使用記號「{1}」簽署用於 OSM 伺服器「{0}」的要求。<br>這個記號可能是無效的。</html>"
+msgstr ""
+"<html>無法使用記號「{1}」簽署用於 OSM 伺服器「{0}」的要求。<br>這個記號可能是"
+"無效的。</html>"
 
 #: ../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>"
-msgstr "<html>這個測試失敗了，因為伺服器回應了內部的錯誤。<br>JOSM 無法決定記號是否有效。請稍後再試一次。</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 ""
+"<html>這個測試失敗了，因為伺服器回應了內部的錯誤。<br>JOSM 無法決定記號是否有"
+"效。請稍後再試一次。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
@@ -11089,5 +11245,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 "請選擇要刪除的列。"
@@ -11440,6 +11596,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 "使用表格查詢的方式繪製方向箭頭而非複雜的數學運算。"
 
@@ -11498,6 +11653,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 "在地圖檢視套用平滑化以產生較平滑的外觀。"
 
@@ -11569,5 +11723,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 "啟用內建預設值"
@@ -11587,6 +11741,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>:"
@@ -11702,5 +11855,7 @@
 "<p>Please note that shortcut keys are assigned to the actions when JOSM is "
 "started. So you need to <b>restart</b> JOSM to see your changes.</p>"
-msgstr "<p>請注意捷徑鍵會在 JOSM 啟動時指派動作。因此您需要<b>重新啟動</b> JOSM 來看看您的變更。</p>"
+msgstr ""
+"<p>請注意捷徑鍵會在 JOSM 啟動時指派動作。因此您需要<b>重新啟動</b> JOSM 來看"
+"看您的變更。</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:168
@@ -11709,7 +11864,10 @@
 "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>"
-msgstr ""
+"This is another reason to <b>restart</b> JOSM after making any changes here."
+"</p>"
+msgstr ""
+"<p>此外，捷徑鍵會在動作第一次指派到按鈕的選單項目時生效。因此您的變更有時不需"
+"重新啟動就可以使用 --- 但是若與其他處理衝突就不行了。這也是另一個要求在這裡進"
+"行變更後必須<b>重新啟動</b> JOSM 的理由。</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:171
@@ -11721,9 +11879,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 ""
 
@@ -12020,7 +12178,9 @@
 #, java-format
 msgid ""
-"<html>Failed to load the list of style sources "
-"from<br>''{0}''.<br><br>Details (untranslated):<br>{1}</html>"
-msgstr "<html>無法從這裡載入樣式來源清單：<br>「{0}」。<br><br>詳細資料 (未翻譯):<br>{1}</html>"
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+"<html>無法從這裡載入樣式來源清單：<br>「{0}」。<br><br>詳細資料 (未翻譯):<br>"
+"{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
@@ -12030,5 +12190,5 @@
 msgstr "警告：樣式清單「{0}」中項目的格式不正確。得到「{1}」。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #, java-format
 msgid ""
@@ -12040,20 +12200,20 @@
 
 #. 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 "無法讀取標籤預設組合來源 {0}"
 
-#: ../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 ""
-"<html>標籤預設組合來源 {0} 可以載入但是它包含錯誤。您是否確定要使用它？<br><br><table width=600>錯誤為： "
-"[{1}:{2}] {3}</table></html>"
-
-#: ../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 ""
+"<html>標籤預設組合來源 {0} 可以載入但是它包含錯誤。您是否確定要使用它？"
+"<br><br><table width=600>錯誤為： [{1}:{2}] {3}</table></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
 #, java-format
 msgid ""
@@ -12061,8 +12221,8 @@
 "it?<br><br><table width=400>Error is: [{1}:{2}] {3}</table></html>"
 msgstr ""
-"<html>無法分折標籤預設組合來源：{0}。您是否確定要使用它？<br><br><table width=400>錯誤為： [{1}:{2}] "
-"{3}</table></html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
+"<html>無法分折標籤預設組合來源：{0}。您是否確定要使用它？<br><br><table "
+"width=400>錯誤為： [{1}:{2}] {3}</table></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
 #, java-format
 msgid ""
@@ -12070,8 +12230,8 @@
 "really want to use it?<br><br><table width=600>Error is: {1}</table></html>"
 msgstr ""
-"<html>標籤預設組合來源 {0} 可以載入但是它包含錯誤。您是否確定要使用它？<br><br><table "
-"width=600>錯誤為：{1}</table></html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:101
+"<html>標籤預設組合來源 {0} 可以載入但是它包含錯誤。您是否確定要使用它？"
+"<br><br><table width=600>錯誤為：{1}</table></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
 #, java-format
 msgid ""
@@ -12082,9 +12242,9 @@
 "width=600>錯誤為：{1}</table></html>"
 
-#: ../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 "加上預先組合標籤"
@@ -12183,5 +12343,6 @@
 "<html>''{0}'' is not a valid OSM API URL.<br>Please check the spelling and "
 "validate again.</html>"
-msgstr "<html>「{0}」不是有效的 OSM API URL。<br>請檢查拼字後再驗證一次。</html>"
+msgstr ""
+"<html>「{0}」不是有效的 OSM API URL。<br>請檢查拼字後再驗證一次。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
@@ -12193,7 +12354,9 @@
 #, 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>"
-msgstr "<html>無法建立 URL「{0}」來驗證 OSM API 伺服器。<br>請檢查「{1}」的拼字後再驗證一次。</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 ""
+"<html>無法建立 URL「{0}」來驗證 OSM API 伺服器。<br>請檢查「{1}」的拼字後再驗"
+"證一次。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
@@ -12202,5 +12365,7 @@
 "<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
 "''{1}'' and your Internet connection and validate again.</html>"
-msgstr "<html>無法建立連線到 URL「{0}」。<br>請檢查「{1}」的拼字與您的網際網路連線後再驗證一次。</html>"
+msgstr ""
+"<html>無法建立連線到 URL「{0}」。<br>請檢查「{1}」的拼字與您的網際網路連線後"
+"再驗證一次。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
@@ -12214,9 +12379,9 @@
 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>"
-msgstr ""
-"<html>無法從這個 OSM API 伺服器取回變更組合的清單：<br>「{1}」。伺服器傳回代碼為 {0} 而非 "
-"200。<br>請檢查「{1}」的拼字後再驗證一次。</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 ""
+"<html>無法從這個 OSM API 伺服器取回變更組合的清單：<br>「{1}」。伺服器傳回代"
+"碼為 {0} 而非 200。<br>請檢查「{1}」的拼字後再驗證一次。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
@@ -12227,6 +12392,6 @@
 "spelling of ''{0}'' and validate again.</html>"
 msgstr ""
-"<html>OSM API 伺服器「{0}」並未傳回有效的回應。<br>可能「{0}」不是 OSM API "
-"伺服器。<br>請檢查「{0}」的拼字並再驗證一次。</html>"
+"<html>OSM API 伺服器「{0}」並未傳回有效的回應。<br>可能「{0}」不是 OSM API 伺"
+"服器。<br>請檢查「{0}」的拼字並再驗證一次。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
@@ -12252,5 +12417,7 @@
 "Warning: Unsupported value in preference ''{0}'', got {1}''. Using "
 "authentication method ''Basic Authentication''."
-msgstr "警告：在偏好設定「{0}」中有不支援的數值，發現「{1}」。使用的驗證方式為「基礎驗證」。"
+msgstr ""
+"警告：在偏好設定「{0}」中有不支援的數值，發現「{1}」。使用的驗證方式為「基礎"
+"驗證」。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
@@ -12277,7 +12444,8 @@
 "server. <strong>Do not use a valuable password.</strong></p></body></html>"
 msgstr ""
-"<html><body><p class=\"warning-body\"><strong>警告：</strong>密碼是以純文字儲存在 JOSM "
-"偏好設定檔案中。此外，它每次都是以<strong>未加密</strong>的方式隨著每個要求傳送到 OSM "
-"伺服器。<strong>請勿使用重要的密碼。</strong></p></body></html>"
+"<html><body><p class=\"warning-body\"><strong>警告：</strong>密碼是以純文字儲"
+"存在 JOSM 偏好設定檔案中。此外，它每次都是以<strong>未加密</strong>的方式隨著"
+"每個要求傳送到 OSM 伺服器。<strong>請勿使用重要的密碼。</strong></p></body></"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:117
@@ -12298,6 +12466,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 "警告：無法從憑證管理程式取回 OAuth 存取記號"
 
@@ -12313,6 +12480,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 "您已經有能用 OAuth 存取 OSM 伺服器的存取記號。"
 
@@ -12406,8 +12572,9 @@
 #: ../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)"
-msgstr ""
-"使用標準的系統設定值 (已停用。使用 <tt>-Djava.net.useSystemProxies=true</tt> 啟動 JOSM 可以啟用它)"
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+"使用標準的系統設定值 (已停用。使用 <tt>-Djava.net.useSystemProxies=true</tt> "
+"啟動 JOSM 可以啟用它)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:256
@@ -12423,5 +12590,7 @@
 "Warning: JOSM is configured to use proxies from the system setting, but the "
 "JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr "警告：JOSM 是設定為使用系統設定的代理伺服器，但是 JVM 並未設定為可以取得它們。將偏好設定重設為「不使用代理伺服器」"
+msgstr ""
+"警告：JOSM 是設定為使用系統設定的代理伺服器，但是 JVM 並未設定為可以取得它"
+"們。將偏好設定重設為「不使用代理伺服器」"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:58
@@ -12449,5 +12618,6 @@
 "Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
 "be the same as in values"
-msgstr "損壞的預設組合 \"{0}-{1}\" - 在 display_values 中項目的數量必須和數值裡的相同"
+msgstr ""
+"損壞的預設組合 \"{0}-{1}\" - 在 display_values 中項目的數量必須和數值裡的相同"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:469
@@ -12537,4 +12707,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 "改變屬性"
@@ -12682,5 +12853,7 @@
 "Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
 "use no proxy."
-msgstr "警告：發現未預期的偏好設定「{0}」數值。得到的數值是「{1}」。將不使用代理伺服器。"
+msgstr ""
+"警告：發現未預期的偏好設定「{0}」數值。得到的數值是「{1}」。將不使用代理伺服"
+"器。"
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
@@ -12700,5 +12873,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
@@ -12713,5 +12886,6 @@
 "time.  Will not use a proxy."
 msgstr ""
-"警告：JVM 並未設定從系統設定值查詢代理伺服器。屬性「java.net.useSystemProxies」在啟動時遺失了。將不使用代理伺服器。"
+"警告：JVM 並未設定從系統設定值查詢代理伺服器。屬性「java.net."
+"useSystemProxies」在啟動時遺失了。將不使用代理伺服器。"
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83
@@ -12719,5 +12893,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}''"
@@ -12878,10 +13052,11 @@
 "Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
 "zip file ''{0}''. Exception was: {1}"
-msgstr "警告：無法開啟 zip 檔案「{0}」中副檔名「{2}」，名稱為「{3}」的檔案。例外為：{1}"
+msgstr ""
+"警告：無法開啟 zip 檔案「{0}」中副檔名「{2}」，名稱為「{3}」的檔案。例外為："
+"{1}"
 
 #: ../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 "在本地端資料組合中沒有 id {0} 的原型。不能推斷原型的類型。"
 
@@ -12997,10 +13172,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 "伺服器回覆未預期的 id 格式，取得「{0}」"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:278
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -13008,69 +13183,69 @@
 msgstr "已修改原型「{0}」的新版本有未預期的格式。得到「{1}」。"
 
-#: ../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 "成功的開放變更組合 {0}"
 
-#: ../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 "預期變更組合 ID > 0 。得到 {0}。"
 
-#: ../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 "正在更新變更組合 {0}..."
 
-#: ../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 "等待 10 秒... "
 
-#: ../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 "{2} 秒內開始重試 {1} 次中的第 {0} 次 ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:458
 msgid "OK - trying again."
 msgstr "OK - 再試一次。"
 
-#: ../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 "開始重試 {1} 次中的第 {0} 次。"
 
-#: ../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 "目前的變更組合為 null。不能上傳資料。"
 
-#: ../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 "目前的變更組合 ID 必須大於 0。目前的 ID 是 {0}。"
 
-#: ../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}."
@@ -13176,5 +13351,6 @@
 "Warning: unsupported start element ''{0}'' in changeset content at position "
 "({1},{2}). Skipping."
-msgstr "警告：在變更組合內容的位置 ({1},{2}) 有不支援的起始元素「{0}」。正在略過。"
+msgstr ""
+"警告：在變更組合內容的位置 ({1},{2}) 有不支援的起始元素「{0}」。正在略過。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:241
@@ -13182,5 +13358,7 @@
 "Illegal document structure. Found node, way, or relation outside of "
 "''create'', ''modify'', or ''delete''."
-msgstr "不合格的文件結構。發現節點、路徑或關係並非「create」、「modify」或「delete」。"
+msgstr ""
+"不合格的文件結構。發現節點、路徑或關係並非「create」、「modify」或"
+"「delete」。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:259
@@ -13189,5 +13367,6 @@
 "Warning: unsupported end element ''{0}'' in changeset content at position "
 "({1},{2}). Skipping."
-msgstr "警告：在變更組合內容的位置 ({1},{2}) 有不支援的結尾元素「{0}」。正在略過。"
+msgstr ""
+"警告：在變更組合內容的位置 ({1},{2}) 有不支援的結尾元素「{0}」。正在略過。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:307
@@ -13248,4 +13427,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})"
@@ -13265,6 +13445,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 "<html>從備份檔案還原時發生錯誤。<br>錯誤為：<br>{0}</html>"
 
@@ -13292,9 +13472,9 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
-msgstr ""
-"元素「bounds」缺少必要的屬性。得到 "
-"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 ""
+"元素「bounds」缺少必要的屬性。得到 minlon=''{0}'',minlat=''{1}'',"
+"maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
@@ -13335,6 +13515,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 "在關係 {0} 的成員屬性「ref」有不合格的數值。得到 {1}"
 
@@ -13401,5 +13580,7 @@
 "WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
 "API version is ''{3}''. Got {1}."
-msgstr "警告：將元素 {0} 的屬性「version」數值一般化為 {2}，API 版本為「{3}」。得到 {1}。"
+msgstr ""
+"警告：將元素 {0} 的屬性「version」數值一般化為 {2}，API 版本為「{3}」。得到 "
+"{1}。"
 
 #. should not happen. API version has been checked before
@@ -13467,5 +13648,7 @@
 "Way {0} with {1} nodes has incomplete nodes because at least one node was "
 "missing in the loaded data."
-msgstr "有 {1} 個節點的路徑 {0} 有不完整的節點，因為在載入的資料中至少有一個節點遺失了。"
+msgstr ""
+"有 {1} 個節點的路徑 {0} 有不完整的節點，因為在載入的資料中至少有一個節點遺失"
+"了。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
@@ -13653,5 +13836,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:112
 msgid "Download skipped"
-msgstr ""
+msgstr "下載略過的"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:118
@@ -13667,5 +13850,7 @@
 "Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
 "valid URL. Skipping download."
-msgstr "警告：不能下載外掛程式「{0}」。它的下載連結「{1}」不是有效的 URL。正略過下載。"
+msgstr ""
+"警告：不能下載外掛程式「{0}」。它的下載連結「{1}」不是有效的 URL。正略過下"
+"載。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:167
@@ -13698,6 +13883,6 @@
 "disabled.<br>Delete from preferences?</html>"
 msgstr ""
-"<html>已要求載入外掛程式「{0}」。<br>這個外掛程式已不再開發並且很有可能產生問題。<br>它應該被停用。<br>是否從偏好設定中刪除？</ht"
-"ml>"
+"<html>已要求載入外掛程式「{0}」。<br>這個外掛程式已不再開發並且很有可能產生問"
+"題。<br>它應該被停用。<br>是否從偏好設定中刪除？</html>"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:167
@@ -13705,5 +13890,7 @@
 "You updated your JOSM software.<br>To prevent problems the plugins should be "
 "updated as well.<br><br>Update plugins now?"
-msgstr "您已經更新了 JOSM 軟體。<br>為了避免問題也應該更新外掛程式。<br><br>是否立即更新？"
+msgstr ""
+"您已經更新了 JOSM 軟體。<br>為了避免問題也應該更新外掛程式。<br><br>是否立即"
+"更新？"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:183
@@ -13766,9 +13953,9 @@
 #, java-format
 msgid ""
-"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is "
-"{2}.<br>You have to update JOSM in order to use this plugin.</html>"
-msgstr ""
-"<html>外掛程式 {0} 需要 JOSM 版本 {1}。目前的 JOSM 版本為 {2}。<br>您必須更新 JOSM "
-"才能使用這個外掛程式。</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 ""
+"<html>外掛程式 {0} 需要 JOSM 版本 {1}。目前的 JOSM 版本為 {2}。<br>您必須更"
+"新 JOSM 才能使用這個外掛程式。</html>"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
@@ -13787,5 +13974,7 @@
 "<html>Could not load plugin {0} because the plugin<br>main class ''{1}'' was "
 "not found.<br>Delete from preferences?"
-msgstr "<html>無法載入外掛程式 {0} 因為外掛程式<br>main 類別「{1}」找不到。<br>是否從偏好設定刪除？"
+msgstr ""
+"<html>無法載入外掛程式 {0} 因為外掛程式<br>main 類別「{1}」找不到。<br>是否從"
+"偏好設定刪除？"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:411
@@ -13880,5 +14069,7 @@
 "Warning: failed to install already downloaded plugin ''{0}''. Skipping "
 "installation. JOSM is still going to load the old plugin version."
-msgstr "警告：無法安裝已下載的外掛程式「{0}」。正在略過安裝。JOSM 仍然會載入舊的外掛程式版本。"
+msgstr ""
+"警告：無法安裝已下載的外掛程式「{0}」。正在略過安裝。JOSM 仍然會載入舊的外掛"
+"程式版本。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
@@ -13969,11 +14160,10 @@
 #: ../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 "警告：無法掃描檔案「{0}」的外掛程式資訊。正在略過。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:109
 msgid "Processing plugin site cache icon files..."
-msgstr ""
+msgstr "正在處理外掛程式網站快取圖示檔案..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:133
@@ -13997,5 +14187,7 @@
 "Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
 "from plugin site ''{1}''."
-msgstr "警告：無法建立外掛程式目錄「{0}」。不能從外掛程式網站「{1}」快取外掛程式清單。"
+msgstr ""
+"警告：無法建立外掛程式目錄「{0}」。不能從外掛程式網站「{1}」快取外掛程式清"
+"單。"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263
@@ -14035,5 +14227,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"
@@ -14049,5 +14241,7 @@
 "are running the latest<br>version of JOSM, please consider being kind and "
 "file a bug report."
-msgstr "發生未預期的例外。<br>這通常是程式碼的錯誤。如果您使用的是最新版的<br>JOSM，請考慮不吝回報錯誤。"
+msgstr ""
+"發生未預期的例外。<br>這通常是程式碼的錯誤。如果您使用的是最新版的<br>JOSM，"
+"請考慮不吝回報錯誤。"
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
@@ -14059,5 +14253,6 @@
 "You have encountered an error in JOSM. Before you file a bug report make "
 "sure you have updated to the latest version of JOSM here:"
-msgstr "您遇到了 JOSM 的錯誤。在您回報錯誤之前請確定您已更新到在這裡最新版的 JOSM："
+msgstr ""
+"您遇到了 JOSM 的錯誤。在您回報錯誤之前請確定您已更新到在這裡最新版的 JOSM："
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
@@ -14065,5 +14260,7 @@
 "You should also update your plugins. If neither of those help please file a "
 "bug report in our bugtracker using this link:"
-msgstr "您也應該更新您的外掛程式。如果這些都沒有幫助，請在以下連結的錯誤追蹤程式回報錯誤："
+msgstr ""
+"您也應該更新您的外掛程式。如果這些都沒有幫助，請在以下連結的錯誤追蹤程式回報"
+"錯誤："
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
@@ -14072,5 +14269,7 @@
 "you. Please include information on how to reproduce the error and try to "
 "supply as much detail as possible."
-msgstr "下面提供了錯誤訊息已為您填好。請加上關於如何重現這個錯誤的資訊，並儘可能詳細一些。"
+msgstr ""
+"下面提供了錯誤訊息已為您填好。請加上關於如何重現這個錯誤的資訊，並儘可能詳細"
+"一些。"
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
@@ -14093,5 +14292,7 @@
 "<html>Failed to initialize communication with the OSM server {0}.<br>Check "
 "the server URL in your preferences and your internet connection.</html>"
-msgstr "<html>無法初始化與 OSM 伺服器 {0} 的連線。<br>請檢查您偏好設定中伺服器 URL 和網際網路連線。</html>"
+msgstr ""
+"<html>無法初始化與 OSM 伺服器 {0} 的連線。<br>請檢查您偏好設定中伺服器 URL 和"
+"網際網路連線。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
@@ -14103,6 +14304,6 @@
 "Access Token.</html>"
 msgstr ""
-"<html>無法驗證 OSM 伺服器「{0}」。<br>您正使用 OAuth 驗證但目前尚未設定<br>OAuth "
-"存取記號。<br>請開啟偏好設定對話盒並產生或輸入存取記號。</html>"
+"<html>無法驗證 OSM 伺服器「{0}」。<br>您正使用 OAuth 驗證但目前尚未設定"
+"<br>OAuth 存取記號。<br>請開啟偏好設定對話盒並產生或輸入存取記號。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:78
@@ -14113,6 +14314,6 @@
 "reference to relation {0}, and upload again.</html>"
 msgstr ""
-"<html><strong>無法</strong>刪除<strong>關係 {0}</strong>。它仍然被關係 {1} 參照。<br>請載入關係 "
-"{1}，移除對關係 {0} 的參照，並再上傳一次。</html>"
+"<html><strong>無法</strong>刪除<strong>關係 {0}</strong>。它仍然被關係 {1} 參"
+"照。<br>請載入關係 {1}，移除對關係 {0} 的參照，並再上傳一次。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:105
@@ -14120,37 +14321,41 @@
 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>"
-msgstr ""
-"<html>上傳至伺服器<strong>失敗</strong>，因為您目前的<br>資料組合違反了先決條件。<br>錯誤的訊息為：<br>{0}</htm"
-"l>"
+"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
+"html>"
+msgstr ""
+"<html>上傳至伺服器<strong>失敗</strong>，因為您目前的<br>資料組合違反了先決條"
+"件。<br>錯誤的訊息為：<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:113
 #, 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>"
-msgstr "<html>以使用者名稱「{0}」驗證 OSM 伺服器失敗。<br>請檢查在 JOSM 偏好設定中的使用者名稱和密碼。</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 ""
+"<html>以使用者名稱「{0}」驗證 OSM 伺服器失敗。<br>請檢查在 JOSM 偏好設定中的"
+"使用者名稱和密碼。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
 #, 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>"
-msgstr ""
-"<html>以 OAuth 存取記號「{0}」驗證 OSM 伺服器失敗。<br>請執行偏好設定對話盒並取回另一個 OAuth 存取記號。</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 ""
+"<html>以 OAuth 存取記號「{0}」驗證 OSM 伺服器失敗。<br>請執行偏好設定對話盒並"
+"取回另一個 OAuth 存取記號。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:133
 #, 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>"
-msgstr ""
-"<html>以 OAuth 存取記號「{0}」驗證 OSM "
-"伺服器失敗。<br>這個記號未獲授權存取受保護的資源<br>「{1}」。<br>請執行偏好設定對話盒並取回另一個 OAuth 存取記號。</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 ""
+"<html>以 OAuth 存取記號「{0}」驗證 OSM 伺服器失敗。<br>這個記號未獲授權存取受"
+"保護的資源<br>「{1}」。<br>請執行偏好設定對話盒並取回另一個 OAuth 存取記號。"
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
@@ -14169,10 +14374,11 @@
 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>"
-msgstr ""
-"<html>與 OSM 伺服器「{0}」連線失敗。伺服器回覆<br>下列錯誤代碼與訊息：<br><strong>錯誤代碼：<strong> "
-"{1}<br><strong>錯誤訊息 (未翻譯)</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 ""
+"<html>與 OSM 伺服器「{0}」連線失敗。伺服器回覆<br>下列錯誤代碼與訊息："
+"<br><strong>錯誤代碼：<strong> {1}<br><strong>錯誤訊息 (未翻譯)</strong>： "
+"{2}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:212
@@ -14181,5 +14387,7 @@
 "<html>Closing of changeset <strong>{0}</strong> failed <br>because it has "
 "already been closed.</html>"
-msgstr "<html>變更組合 <strong>{0}</strong> 的關閉失敗 <br>因為它已經被關閉了。</html>"
+msgstr ""
+"<html>變更組合 <strong>{0}</strong> 的關閉失敗 <br>因為它已經被關閉了。</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
@@ -14188,5 +14396,7 @@
 "<html>Closing of changeset <strong>{0}</strong> failed<br> because it has "
 "already been closed on {1}.</html>"
-msgstr "<html>變更組合 <strong>{0}</strong> 的關閉失敗 <br>因為它已經在 {1} 被關閉了。</html>"
+msgstr ""
+"<html>變更組合 <strong>{0}</strong> 的關閉失敗 <br>因為它已經在 {1} 被關閉"
+"了。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:227
@@ -14206,5 +14416,7 @@
 "<html>Failed to upload to changeset <strong>{0}</strong><br>because it has "
 "already been closed on {1}.</html>"
-msgstr "<html>無法上傳變更組合 <strong>{0}</strong><br>因為它已經被關閉於 {1}。</html>"
+msgstr ""
+"<html>無法上傳變更組合 <strong>{0}</strong><br>因為它已經被關閉於 {1}。</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
@@ -14215,6 +14427,6 @@
 "applet and because you did not load your applet from ''{1}''.</html>"
 msgstr ""
-"<html>基於安全性的理由無法連線到遠端伺服器<br>「{0}」<br>這大部分是因為您以 applet 執行<br>以及您沒有從「{1}」載入 "
-"applet。</html>"
+"<html>基於安全性的理由無法連線到遠端伺服器<br>「{0}」<br>這大部分是因為您以 "
+"applet 執行<br>以及您沒有從「{1}」載入 applet。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:304
@@ -14223,5 +14435,6 @@
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
 "check your internet connection.</html>"
-msgstr "<html>無法連線到遠端伺服器<br>「{0}」<br>請檢查您的網際網路連線。</html>"
+msgstr ""
+"<html>無法連線到遠端伺服器<br>「{0}」<br>請檢查您的網際網路連線。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:321
@@ -14230,5 +14443,7 @@
 "<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
 "problem with transferring data.<br>Details(untranslated): {1}</html>"
-msgstr "<html>無法由此上傳或下載資料：<br>「{0}」<br>因為傳輸資料有問題。<br>詳細資料(未翻譯)： {1}</html>"
+msgstr ""
+"<html>無法由此上傳或下載資料：<br>「{0}」<br>因為傳輸資料有問題。<br>詳細資料"
+"(未翻譯)： {1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:336
@@ -14237,14 +14452,16 @@
 "<html>Failed to download data. Its format is either unsupported, ill-formed, "
 "and/or inconsistent.<br><br>Details (untranslated): {0}</html>"
-msgstr "<html>無法下載資料。它的格式可能不支援、格式有問題和/或不一致。<br><br>詳細資料 (未翻譯)： {0}</html>"
+msgstr ""
+"<html>無法下載資料。它的格式可能不支援、格式有問題和/或不一致。<br><br>詳細資"
+"料 (未翻譯)： {0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:352
 #, 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>"
-msgstr ""
-"<html>OSM 伺服器<br>「{0}」<br>回報了內部的伺服器錯誤。<br>這很可能是暫時性的錯誤。請稍後再試一次。</html>"
+"<html>The OSM server<br>''{0}''<br>reported an internal server error."
+"<br>This is most likely a temporary problem. Please try again later.</html>"
+msgstr ""
+"<html>OSM 伺服器<br>「{0}」<br>回報了內部的伺服器錯誤。<br>這很可能是暫時性的"
+"錯誤。請稍後再試一次。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
@@ -14255,8 +14472,10 @@
 #: ../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."
-msgstr "您嘗試下載的區域太大或是您的要求太大。<br>可以要求小一點的區域或是使用 OSM 社群提供的匯出檔案。"
+"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 ""
+"您嘗試下載的區域太大或是您的要求太大。<br>可以要求小一點的區域或是使用 OSM 社"
+"群提供的匯出檔案。"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:374
@@ -14273,6 +14492,7 @@
 "check the server''s address ''{0}'' for typos."
 msgstr ""
-"OSM 伺服器「{0}」不知道您嘗試讀取、<br>更新或刪除的物件。可能是各個物件不在<br>伺服器上或是您使用無效的 URL "
-"存取<br>它。請小心檢查伺服器位址「{0}」以免打錯字。"
+"OSM 伺服器「{0}」不知道您嘗試讀取、<br>更新或刪除的物件。可能是各個物件不在"
+"<br>伺服器上或是您使用無效的 URL 存取<br>它。請小心檢查伺服器位址「{0}」以免"
+"打錯字。"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:415
@@ -14283,6 +14503,6 @@
 "preferences and your internet connection.</html>"
 msgstr ""
-"<html>無法連線至遠端伺服器<br>「{0}」。<br>無法解析主機名稱「{1}」。<br>請檢查您偏好設定中的 API URL "
-"與網際網路連線。</html>"
+"<html>無法連線至遠端伺服器<br>「{0}」。<br>無法解析主機名稱「{1}」。<br>請檢"
+"查您偏好設定中的 API URL 與網際網路連線。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:487
@@ -14291,9 +14511,10 @@
 "<html>The server reports that an object is deleted.<br><strong>Uploading "
 "failed</strong> if you tried to update or delete this object.<br> "
-"<strong>Downloading failed</strong> if you tried to download this "
-"object.<br><br>The error message is:<br>{0}</html>"
-msgstr ""
-"<html>伺服器回報有物件已被刪除。<br>如果您嘗試更新或刪除這個物件則會<strong>上傳失敗</strong>。<br>如果您嘗試下載這個物件則"
-"會<strong>下載失敗</strong>。<br><br>錯誤的訊息為：<br>{0}</html>"
+"<strong>Downloading failed</strong> if you tried to download this object."
+"<br><br>The error message is:<br>{0}</html>"
+msgstr ""
+"<html>伺服器回報有物件已被刪除。<br>如果您嘗試更新或刪除這個物件則會<strong>"
+"上傳失敗</strong>。<br>如果您嘗試下載這個物件則會<strong>下載失敗</strong>。"
+"<br><br>錯誤的訊息為：<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/I18n.java:439
@@ -14327,5 +14548,6 @@
 "Warning: failed to derive wiki language prefix from JOSM locale code "
 "''{0}''. Using default code ''en''."
-msgstr "警告：無法從 JOSM 地區代碼「{0}」取得 wiki 語言前綴。使用預設的代碼「en」。"
+msgstr ""
+"警告：無法從 JOSM 地區代碼「{0}」取得 wiki 語言前綴。使用預設的代碼「en」。"
 
 #: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
@@ -14400,5 +14622,6 @@
 "Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
 "geometry from preferences."
-msgstr "偏好設定的設定鍵「{0}」不包含「{1}」。不能從偏好設定中回復視窗位置大小。"
+msgstr ""
+"偏好設定的設定鍵「{0}」不包含「{1}」。不能從偏好設定中回復視窗位置大小。"
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:113
@@ -14407,5 +14630,7 @@
 "Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
 "{2}. Cannot restore window geometry from preferences."
-msgstr "偏好設定的設定鍵「{0}」沒有提供「{1}」的整數值。得到「{2}」。不能從偏好設定中回復視窗位置大小。"
+msgstr ""
+"偏好設定的設定鍵「{0}」沒有提供「{1}」的整數值。得到「{2}」。不能從偏好設定中"
+"回復視窗位置大小。"
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:115
@@ -14414,5 +14639,7 @@
 "Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
 "{2}. Cannot restore window geometry from preferences."
-msgstr "無法解析偏好設定的設定鍵「{0}」的欄位「{1}」。例外為：「{2}」。不能從偏好設定中回復視窗位置大小。"
+msgstr ""
+"無法解析偏好設定的設定鍵「{0}」的欄位「{1}」。例外為：「{2}」。不能從偏好設定"
+"中回復視窗位置大小。"
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:122
@@ -14600,9 +14827,9 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113
 msgid "Estimate"
-msgstr ""
+msgstr "預計"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113
 msgid "Potential"
-msgstr ""
+msgstr "潛在"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190
@@ -14807,6 +15034,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>"
@@ -14820,5 +15047,6 @@
 "</span><span style=\"font-size: medium;\"><br>\n"
 "...或者它應該被稱為 <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> 外掛程式...</span>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> 外掛程式...</"
+"span>\n"
 "</div>\n"
 "</html>"
@@ -14838,5 +15066,6 @@
 msgstr ""
 "<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays會幫助您對齊兩個\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays會幫助您對"
+"齊兩個\n"
 "路徑區段。舉例來說，當您在描繪建築物的\n"
 "輪廓而且希望它的邊緣和街道或道路平行\n"
@@ -14854,6 +15083,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"
@@ -14866,6 +15095,6 @@
 "<div style=\"font-family: sans-serif;\">\n"
 "<ul>\n"
-"<li><b>Select a reference segment.</b> 要這麼做您可以按<b><i><span "
-"style=\"color:green\">Ctrl-點選</span></i></b>\n"
+"<li><b>Select a reference segment.</b> 要這麼做您可以按<b><i><span style="
+"\"color:green\">Ctrl-點選</span></i></b>\n"
 "一個區段。而另一個，要被對齊的區段就會變得跟這個區段\n"
 "平行。</li>\n"
@@ -14902,6 +15131,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"
@@ -14917,7 +15146,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"
@@ -14930,6 +15159,6 @@
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>對齊區段。</b> 請按 <b><i><span style=\"color:green\">Shift-"
-"A</span></i></b>。另外您可以在<b>工具</b>選單找到這個指令\n"
+"  <li><b>對齊區段。</b> 請按 <b><i><span style=\"color:green\">Shift-A</"
+"span></i></b>。另外您可以在<b>工具</b>選單找到這個指令\n"
 "，也可以把這個動作放置到<b>工具列</b>上。\n"
 "  </li>\n"
@@ -14986,9 +15215,29 @@
 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 "設定建築物大小"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#, fuzzy
+msgid "Rotate crosshair"
+msgstr "向右旋轉"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#, fuzzy
+msgid "Advanced settings"
+msgstr "設定進階設定值"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#, fuzzy
+msgid "Building tag:"
+msgstr "建築物"
+
+#: ../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"
@@ -14997,35 +15246,48 @@
 #: ../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 "建立建築物"
+
+#: ../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
+#, fuzzy
+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"
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:379
+#, fuzzy
+msgid "Point on the corner of the building to start drawing"
+msgstr "點選開始繪製建築物的角落"
+
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:381
+#, fuzzy
+msgid "Point on opposite end of the building"
 msgstr "點到建築物對面的結尾"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
-msgid "Set width of building"
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:383
+#, fuzzy
+msgid "Set width of the building"
 msgstr "設定建築物的寬度"
 
@@ -15214,7 +15476,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--waterway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15224,5 +15486,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15232,5 +15494,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15246,5 +15508,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15254,5 +15516,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15260,8 +15522,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 "水域"
@@ -15283,5 +15545,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15290,5 +15552,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15297,5 +15559,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15304,5 +15566,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15311,5 +15573,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15318,10 +15580,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 "住址"
@@ -15350,11 +15612,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 ""
 
@@ -15739,5 +16000,7 @@
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
 "known by www.cadastre.gouv.fr .</html>"
-msgstr "<html>輸入鎮、鄉或城市名稱。<br>使用在 www.cadastre.gouv.fr 已知的語法及標點。</html>"
+msgstr ""
+"<html>輸入鎮、鄉或城市名稱。<br>使用在 www.cadastre.gouv.fr 已知的語法及標"
+"點。</html>"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:74
@@ -15793,6 +16056,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 "空白圖層"
@@ -15979,4 +16242,52 @@
 msgstr "找不到 GPX 資料圖層。"
 
+#: ../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 "編輯動物園"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#, fuzzy
+msgid "Name:"
+msgstr "名稱"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#, fuzzy
+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
+#, fuzzy, java-format
+msgid "Delete tool \"{0}\"?"
+msgstr "刪除節點 {0}"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:74
+msgid "Are you sure?"
+msgstr "您確定嗎？"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
+#, fuzzy
+msgid "New tool..."
+msgstr "新的角色"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
+#, fuzzy
+msgid "Install"
+msgstr "工業區"
+
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
 msgid "Position only"
@@ -16098,6 +16409,6 @@
 "plugin/"
 msgstr ""
-"不能載入 rxtxSerial 程式庫。如果您需要安裝上的支援，試試在 http://www.raphael-mack.de/josm-"
-"globalsat-gpx-import-plugin/ 的 Globalsat 首頁"
+"不能載入 rxtxSerial 程式庫。如果您需要安裝上的支援，試試在 http://www."
+"raphael-mack.de/josm-globalsat-gpx-import-plugin/ 的 Globalsat 首頁"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
@@ -16245,5 +16556,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#. 
+#.
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16364,6 +16675,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 "在每個產生的路徑中允許的最大區段數。預設為 250。"
 
@@ -16378,13 +16688,15 @@
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
 "in the range 0-255. Default 90."
-msgstr "被認定為水域的最大灰色數值（基於 Landsat IR-1 資料。可以是範圍 0-255。預設值為 90。"
+msgstr ""
+"被認定為水域的最大灰色數值（基於 Landsat IR-1 資料。可以是範圍 0-255。預設值"
+"為 90。"
 
 #: ../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."
-msgstr ""
-"Douglas-Peucker 線條簡化的準確度，以度為測量單位。<br>較低的數值會產生較多的節點，和更準確的線條。預設值為 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 ""
+"Douglas-Peucker 線條簡化的準確度，以度為測量單位。<br>較低的數值會產生較多的"
+"節點，和更準確的線條。預設值為 0.0003。"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
@@ -16591,13 +16903,13 @@
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46
 msgid "Adds no left turn for sets of 4 or 5 ways."
-msgstr ""
+msgstr "為 4 或 5 條路徑加入禁止左轉。"
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:59
 msgid "Please select 4 or 5 ways to assign no left turns."
-msgstr ""
+msgstr "請選擇 4 或 5 條要指派禁止左轉的路徑。"
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:79
 msgid "Please select 4 ways that form a closed relation."
-msgstr ""
+msgstr "請從封閉的關係選擇 4 條路徑。"
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:106
@@ -16668,6 +16980,6 @@
 "new server? (Strongly recommended)</html>"
 msgstr ""
-"<html>openstreetbugs 外掛程式用的是在 appspot.com 的舊伺服器。<br>新的伺服器在 "
-"schokokeks.org。<br>是否要切換至新的伺服器？（強烈建議）</html>"
+"<html>openstreetbugs 外掛程式用的是在 appspot.com 的舊伺服器。<br>新的伺服器"
+"在 schokokeks.org。<br>是否要切換至新的伺服器？（強烈建議）</html>"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:109
@@ -16679,5 +16991,7 @@
 "<html>The selected data contains data from OpenStreetBugs.<br>You cannot "
 "upload this data. Maybe you have selected the wrong layer?"
-msgstr "<html>選取的資料包含來自 OpenStreetBugs 的資料。<br>您不能上傳這資料。您可能選擇了錯誤的圖層？"
+msgstr ""
+"<html>選取的資料包含來自 OpenStreetBugs 的資料。<br>您不能上傳這資料。您可能"
+"選擇了錯誤的圖層？"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
@@ -16692,6 +17006,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 "標頭包含許多數值而且不能對映為單一字串"
 
@@ -16761,5 +17074,7 @@
 "<html>Really mark this issue as ''done''?<br><br>You may add an optional "
 "comment:</html>"
-msgstr "<html>確定將這個議題標記為「已解決」？<br><br>您也許可以加入額外的註解：</html>"
+msgstr ""
+"<html>確定將這個議題標記為「已解決」？<br><br>您也許可以加入額外的註解：</"
+"html>"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
@@ -16801,6 +17116,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 "您的佇列中有未儲存的變更。是否要立刻送出它們？"
 
@@ -16851,6 +17165,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 "將地點資訊寫入下列檔案的 exif 檔頭："
 
@@ -17157,5 +17470,7 @@
 "port is not variable because it is referenced by external applications "
 "talking to the plugin."
-msgstr "遠端控制外掛程式會一直聽取本機的 8111 連接埠。此連接埠是無法改變的，因為它參照了外部應用程式與此外掛程式的溝通。"
+msgstr ""
+"遠端控制外掛程式會一直聽取本機的 8111 連接埠。此連接埠是無法改變的，因為它參"
+"照了外部應用程式與此外掛程式的溝通。"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
@@ -17186,5 +17501,5 @@
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
 msgid "Remote Control has been asked to create a new node."
-msgstr ""
+msgstr "遠端控制被要求建立新的節點。"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
@@ -17194,13 +17509,13 @@
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
 msgid "Revert changeset fully"
-msgstr ""
+msgstr "還原整個變更組合"
 
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert selection only"
-msgstr ""
+msgstr "只還原選擇區域"
 
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
 msgid "Revert selection and restore deleted objects"
-msgstr ""
+msgstr "還原選擇區域並復原已刪除的物件"
 
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
@@ -17214,5 +17529,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}"
@@ -17259,5 +17574,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:75
 msgid "Downloading changeset"
-msgstr ""
+msgstr "正在下載變更組合"
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:98
@@ -17265,4 +17580,41 @@
 msgid "Revert changeset #{0}"
 msgstr "還原變更組合 #{0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:78
+#, fuzzy
+msgid "Road Sign Plugin"
+msgstr "正在載入外掛程式"
+
+#: ../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 "無法讀取標籤預設組合來源：{0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
+#, fuzzy, java-format
+msgid "Error parsing tagging preset from ''{0}'':\n"
+msgstr "正在分析網站「{0}」的外掛程式清單"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:104
+#, fuzzy, java-format
+msgid "Sign {0}"
+msgstr "選擇區域：{0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:111
+#, fuzzy, java-format
+msgid "Additional sign {0}"
+msgstr "加入關係 {0}"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -17369,4 +17721,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 "簡化路徑"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
+#, fuzzy
+msgid "Delete unnecessary nodes from an area."
+msgstr "刪除路徑不需要的節點。"
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
 msgid "Slippy Map"
@@ -17504,5 +17867,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:40
 msgid "Surveyor waypoint layer"
-msgstr ""
+msgstr "測量員航點圖層"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
@@ -17736,5 +18099,7 @@
 "Warning: turnrestrictions plugin replaces already existing action ''{0}'' "
 "behind shortcut ''{1}'' by action ''{2}''"
-msgstr "警告：turnrestrictions 外掛程式將捷徑鍵「{1}」原本的動作「{0}」替換成動作「{2}」"
+msgstr ""
+"警告：turnrestrictions 外掛程式將捷徑鍵「{1}」原本的動作「{0}」替換成動作"
+"「{2}」"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:67
@@ -17744,5 +18109,6 @@
 "Warning: illegal value ''{0}'' for preference key ''{1}''. Falling back to "
 "default value ''shift ctrl T''."
-msgstr "警告：偏好設定鍵「{1}」有不合格的數值「{0}」。返回到預設值「shift ctrl T」。"
+msgstr ""
+"警告：偏好設定鍵「{1}」有不合格的數值「{0}」。返回到預設值「shift ctrl T」。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:90
@@ -17758,5 +18124,7 @@
 "In the following table you can edit the <strong>raw tags</strong> of the OSM "
 "relation representing this turn restriction."
-msgstr "在下列表格中您可以編輯代表這個轉彎限制的 OSM 關係的<strong>原始標籤</strong>。"
+msgstr ""
+"在下列表格中您可以編輯代表這個轉彎限制的 OSM 關係的<strong>原始標籤</"
+"strong>。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/AdvancedEditorPanel.java:62
@@ -17764,5 +18132,7 @@
 "In the following table you can edit the <strong>raw members</strong> of the "
 "OSM relation representing this turn restriction."
-msgstr "在下列表格中您可以編輯代表這個轉彎限制的 OSM 關係的<strong>原始成員</strong>。"
+msgstr ""
+"在下列表格中您可以編輯代表這個轉彎限制的 OSM 關係的<strong>原始成員</"
+"strong>。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
@@ -17780,5 +18150,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:86
 msgid "Vias:"
-msgstr ""
+msgstr "Vias:"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:123
@@ -17797,5 +18167,6 @@
 "Cannot add object ''{0}'' as relation member because it is deleted or "
 "invisible in layer ''{1}''"
-msgstr "不能將物件「{0}」加入為關係成員，因為它已被刪除或是在圖層「{1}」中是不可視的"
+msgstr ""
+"不能將物件「{0}」加入為關係成員，因為它已被刪除或是在圖層「{1}」中是不可視的"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:102
@@ -17894,5 +18265,6 @@
 "Updates to this turn restriction can''t be saved unless deleted members are "
 "removed.<br>How to you want to proceed?"
-msgstr "除非先移除已刪除的成員否則不能儲存對這個轉彎限制的更新。<br>您想要如何處理？"
+msgstr ""
+"除非先移除已刪除的成員否則不能儲存對這個轉彎限制的更新。<br>您想要如何處理？"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:502
@@ -17924,6 +18296,6 @@
 "a conflict and close the editor?</html>"
 msgstr ""
-"<html>這個轉彎限制已經在編輯器之外被改變了。<br>您不能套用您的變更並繼續編輯。<br><br>您是否要建立一個衝突並關閉這個編輯器？</html"
-">"
+"<html>這個轉彎限制已經在編輯器之外被改變了。<br>您不能套用您的變更並繼續編"
+"輯。<br><br>您是否要建立一個衝突並關閉這個編輯器？</html>"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:627
@@ -17932,5 +18304,7 @@
 "<html>Layer ''{0}'' already has a conflict for object<br>''{1}''.<br>Please "
 "resolve this conflict first, then try again.</html>"
-msgstr "<html>圖層「{0}」已經有衝突於物件<br>「{1}」。<br>請先調解這個衝突，然後再試一次。</html>"
+msgstr ""
+"<html>圖層「{0}」已經有衝突於物件<br>「{1}」。<br>請先調解這個衝突，然後再試"
+"一次。</html>"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:633
@@ -18102,10 +18476,10 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java:173
 msgid "no participating way with role ''from''"
-msgstr ""
+msgstr "沒有加入「from」角色的路徑"
 
 #. FIXME: render as warning/error (red background?)
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java:183
 msgid "no participating way with role ''to''"
-msgstr ""
+msgstr "沒有加入「to」角色的路徑"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:104
@@ -18118,5 +18492,7 @@
 "selection only.<br>Deselect to display all turn restrictions in the current "
 "data set.</html>"
-msgstr "<html>選擇以顯示在目前選擇區域的轉彎限制相關物件。<br>取消選擇則會顯示目前資料組合中所有的轉彎限制。</html>"
+msgstr ""
+"<html>選擇以顯示在目前選擇區域的轉彎限制相關物件。<br>取消選擇則會顯示目前資"
+"料組合中所有的轉彎限制。</html>"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:162
@@ -18155,8 +18531,9 @@
 #: ../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>."
-msgstr ""
-"轉彎限制外掛程式的開發是由 <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 ""
+"轉彎限制外掛程式的開發是由 <a href=\"http://www.skobbler.de\">skobbler GmbH</"
+"a> 贊助。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:96
@@ -18178,5 +18555,6 @@
 "disabled, editing of via-objects is possible in the Advanced Editor only."
 msgstr ""
-"基本編輯器可以選擇性顯示轉彎限制的 via-物件清單。如果啟用，就可以在基本編輯器中編輯它們。如果停用，就只能在進階編輯器中編輯 via-物件。"
+"基本編輯器可以選擇性顯示轉彎限制的 via-物件清單。如果啟用，就可以在基本編輯器"
+"中編輯它們。如果停用，就只能在進階編輯器中編輯 via-物件。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:60
@@ -18201,5 +18579,6 @@
 "Warning: the preference with key ''{0}'' has an unsupported value ''{1}''. "
 "Assuming the default value ''set-a''."
-msgstr "警告：偏好設定鍵「{0}」有不支援的數值「{1}」。推測預設數值應為「set-a」。"
+msgstr ""
+"警告：偏好設定鍵「{0}」有不支援的數值「{1}」。推測預設數值應為「set-a」。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:48
@@ -18207,5 +18586,6 @@
 "Please configure the <strong>keyboard shortcut</strong> which triggers "
 "creating/editing a turn restriction from the current JOSM selection."
-msgstr "請設定 <strong>捷徑鍵</strong> 從目前的 JOSM 選擇區域觸發建立/編輯轉彎限制。"
+msgstr ""
+"請設定 <strong>捷徑鍵</strong> 從目前的 JOSM 選擇區域觸發建立/編輯轉彎限制。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:64
@@ -18242,8 +18622,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 ""
 
@@ -18254,5 +18634,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:38
 msgid "Removes the member with role ''from''"
-msgstr ""
+msgstr "移除角色為「from」的成員"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:47
@@ -18262,5 +18642,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:48
 msgid "Removes the member with role ''to''"
-msgstr ""
+msgstr "移除角色為「to」的成員"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:57
@@ -18277,5 +18657,5 @@
 msgid ""
 "Go to Basic Editor and manually choose members with roles ''from'' and ''to''"
-msgstr ""
+msgstr "移至基本編輯器並手動選擇角色為「from」和「to」的成員"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IllegalRestrictionTypeError.java:27
@@ -18286,9 +18666,11 @@
 "only. Please select one in the Basic editor."
 msgstr ""
+"這個轉彎限制在標籤設定鍵 <tt>restriction</tt> 使用了非標準的限制類型 <tt>{0}"
+"</tt>。只建議使用標準的數值。請在基本編輯器中選擇一項。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IllegalRestrictionTypeError.java:36
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingRestrictionTypeError.java:31
 msgid "Go to Basic Editor and manually choose a turn restriction type"
-msgstr ""
+msgstr "移至基本編輯器並手動選擇轉彎類型"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:37
@@ -18297,8 +18679,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 ""
 
@@ -18315,5 +18697,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:60
 msgid "Go to Basic Editor and manually fix the list of via-objects"
-msgstr ""
+msgstr "移至基本編輯器並手動修正 via-物件清單"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingRestrictionTypeError.java:25
@@ -18321,5 +18703,5 @@
 "A turn restriction must declare the type of restriction. Please select a "
 "type in the Basic Editor."
-msgstr ""
+msgstr "轉彎限制必須宣告限制的種類。請在基本編輯器中選擇一個類型。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:36
@@ -18371,5 +18753,6 @@
 "recommended to use standard values for <tt>except</tt> only."
 msgstr ""
-"標籤 <tt>except</tt> 有非標準的數值 <tt>{0}</tt>。只建議在 <tt>except</tt> 使用標準的數值。"
+"標籤 <tt>except</tt> 有非標準的數值 <tt>{0}</tt>。只建議在 <tt>except</tt> 使"
+"用標準的數值。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/NonStandardExceptWarning.java:34
@@ -18411,16 +18794,18 @@
 #, java-format
 msgid ""
-"This turn restriction uses the OSM node <span class=\"object-"
-"name\">{0}</span> as member with role <tt>{1}</tt>."
-msgstr ""
-"這個轉彎限制使用 OSM 節點 <span class=\"object-name\">{0}</span> 作為角色 <tt>{1}</tt> 的成員。"
+"This turn restriction uses the OSM node <span class=\"object-name\">{0}</"
+"span> as member with role <tt>{1}</tt>."
+msgstr ""
+"這個轉彎限制使用 OSM 節點 <span class=\"object-name\">{0}</span> 作為角色 "
+"<tt>{1}</tt> 的成員。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:51
 #, java-format
 msgid ""
-"This turn restriction uses the OSM relation <span class=\"object-"
-"name\">{0}</span> as member with role <tt>{1}</tt>."
-msgstr ""
-"這個轉彎限制使用 OSM 關係 <span class=\"object-name\">{0}</span> 作為角色 <tt>{1}</tt> 的成員。"
+"This turn restriction uses the OSM relation <span class=\"object-name\">{0}</"
+"span> as member with role <tt>{1}</tt>."
+msgstr ""
+"這個轉彎限制使用 OSM 關係 <span class=\"object-name\">{0}</span> 作為角色 "
+"<tt>{1}</tt> 的成員。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:57
@@ -18699,5 +19084,6 @@
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
-msgstr "這會測試是否有兩條道路、鐵路、水路或建築物在同一圖層交錯，但沒有以節點連接。"
+msgstr ""
+"這會測試是否有兩條道路、鐵路、水路或建築物在同一圖層交錯，但沒有以節點連接。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:126
@@ -18813,6 +19199,6 @@
 "Italia - Italien - Italy."
 msgstr ""
-"這個測試會檢查多語系物件的「name」屬性不會等同於某些「name:*」屬性，並且也不是由「name:*」屬性組成。例如：Italia - "
-"Italien - Italy。"
+"這個測試會檢查多語系物件的「name」屬性不會等同於某些「name:*」屬性，並且也不"
+"是由「name:*」屬性組成。例如：Italia - Italien - Italy。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:47
@@ -19071,10 +19457,9 @@
 #: ../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."
-msgstr ""
-"拼字檢查或標籤檢查資料檔案的來源（URL 或檔案名稱）（請查閱 "
-"http://wiki.openstreetmap.org/index.php/User:JLS/speller）"
+"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
+"org/index.php/User:JLS/speller) or tag checking data files."
+msgstr ""
+"拼字檢查或標籤檢查資料檔案的來源（URL 或檔案名稱）（請查閱 http://wiki."
+"openstreetmap.org/index.php/User:JLS/speller）"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
@@ -19269,9 +19654,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 "區域"
@@ -19367,12 +19752,148 @@
 msgstr "{0}, ..."
 
-#: ../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
+#, fuzzy, java-format
+msgid "{0} {1}% of GPS track"
+msgstr "{0} 由 {1} 軌跡組成"
+
+#: ../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 "匯入音效"
+
+#: ../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 "移除"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
+#, fuzzy
+msgid "removes current video from layer"
+msgstr "從圖層移除相片"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
+#, fuzzy
+msgid "play/pause"
+msgstr "播放/暫停"
+
+#: ../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 "背景"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
+#, fuzzy
+msgid "jumps n sec back"
+msgstr "跳回"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "forward"
+msgstr "快轉"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+#, fuzzy
+msgid "jumps n sec forward"
+msgstr "高速快轉"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
+#, fuzzy
+msgid "faster"
+msgstr "加速"
+
+#: ../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 "放慢"
+
+#: ../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 "允許在目前的 gps 位置加入標記/節點。"
+
+#. 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
+#, fuzzy
+msgid "Jump length"
+msgstr "跳至那裡"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#, fuzzy
+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
+#, fuzzy
+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 "圖層"
+
+#: ../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 ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -19423,5 +19944,7 @@
 "download areas is selected.<br>Select a node on the start or end of a way or "
 "an entire way first.</html>"
-msgstr "<html>有被選取的節點或路徑的結束點<br>在目前的下載區域外。<br>請先選取路徑的開頭或結尾節點或整條路徑。</html>"
+msgstr ""
+"<html>有被選取的節點或路徑的結束點<br>在目前的下載區域外。<br>請先選取路徑的"
+"開頭或結尾節點或整條路徑。</html>"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:107
@@ -19450,6 +19973,7 @@
 "continue way downloading?</html>"
 msgstr ""
-"<html>沒有其他連接的路徑要下載了。<br>然而，發現了目前選取節點可能的複本節點。<br><br>目前選取的節點是「{0}」<br>可能的複本節點是"
-"「{1}」<br>是否將複本節點合併到目前選取的節點並繼續路徑下載？</html>"
+"<html>沒有其他連接的路徑要下載了。<br>然而，發現了目前選取節點可能的複本節"
+"點。<br><br>目前選取的節點是「{0}」<br>可能的複本節點是「{1}」<br>是否將複本"
+"節點合併到目前選取的節點並繼續路徑下載？</html>"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:196
@@ -19588,28 +20112,28 @@
 "這可能會導致錯誤的坐標。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
 msgid "Automatic downloading"
 msgstr "自動下載"
 
-#: ../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 "警告：不使用 WMS 圖層，因為基礎 url「{0}」格式錯誤"
 
-#: ../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 "WMS 圖層 ({0})，於縮放 {1} 自動下載"
 
-#: ../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 "WMS 圖層 ({0})，於縮放 {1} 下載"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
 #, java-format
 msgid ""
@@ -19619,116 +20143,117 @@
 "tiles anyway?"
 msgstr ""
-"<html>這個 WMS 圖層的基礎 URL<br>「{0}」<br>的結尾不能是「&」或「?」。<br>這可能會導致無效的 WMS "
-"要求。您應該檢查您的<br>偏好設定值。<br>是否要強制取回 WMS 拼貼？"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
+"<html>這個 WMS 圖層的基礎 URL<br>「{0}」<br>的結尾不能是「&」或「?」。<br>這"
+"可能會導致無效的 WMS 要求。您應該檢查您的<br>偏好設定值。<br>是否要強制取回 "
+"WMS 拼貼？"
+
+#: ../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 "無效的 URL？"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311
 msgid "Download visible tiles"
 msgstr "下載可見的拼貼"
 
-#: ../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 "改變解析度"
 
-#: ../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 "將 WMS 圖層儲存為檔案"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
 msgid "Save WMS layer"
 msgstr "儲存 WMS 圖層"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413
 msgid "Load WMS layer from file"
 msgstr "從檔案載入 WMS 圖層"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
 msgid "Load WMS layer"
 msgstr "載入 WMS 圖層"
 
-#: ../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 "不支援的 WMS 檔案版本；發現 {0}，應為 {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 "設定 WMS 書籤"
 
-#: ../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 "開啓空白 WMS 圖層以便自檔案載入資料"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
 msgid "WMS Plugin Preferences"
 msgstr "WMS 外掛程式偏好設定"
 
-#: ../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 "修改在 WMS 外掛程式選單中顯示的 WMS 伺服器清單"
 
-#: ../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 "選單名稱"
 
-#: ../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 "WMS URL"
 
-#: ../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 "WMS URL（預設值）"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:86
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
 msgid "Enter a menu name and WMS URL"
 msgstr "輸入選單名稱和 WMS URL"
 
-#: ../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 "下載器："
@@ -19745,4 +20270,9 @@
 msgid "% of north:"
 msgstr "% 北："
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186
+#, fuzzy
+msgid "Simultaneous connections"
+msgstr "節點：連線"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -19754,7 +20284,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
@@ -19774,5 +20304,7 @@
 "The maximum bbox size is 0.25, and your request was too large. Either "
 "request a smaller area, or use planet.osm"
-msgstr "最大的 bbox 大小為 0.25，而您的要求太大了。請使用更小的區域，或改用 planet.osm"
+msgstr ""
+"最大的 bbox 大小為 0.25，而您的要求太大了。請使用更小的區域，或改用 planet."
+"osm"
 
 #. Java message loading audio data
@@ -19802,8 +20334,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 "森林"
@@ -19820,7 +20352,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--boundary tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -19830,5 +20362,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -19871,5 +20403,5 @@
 #. color boundary
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -19879,5 +20411,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -19887,5 +20419,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -19895,15 +20427,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 "邊界"
@@ -19919,5 +20451,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -19926,7 +20458,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--route tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -19936,5 +20468,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -19944,5 +20476,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -19952,5 +20484,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -19960,5 +20492,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -19968,5 +20500,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -19976,5 +20508,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -19984,12 +20516,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 "路線"
@@ -20229,6 +20761,7 @@
 "true :-)"
 msgstr ""
-"允許使用者建立不同的顏色配置並在它們之間切換。只要改變顏色並建立新的配置即可。可用來切換為白色背景以便在明亮的陽光下有較佳的視覺感受。請查閱 JOSM "
-"偏好設定中的對話盒與「地圖設定值」 (有點怪但確是真的 :-)"
+"允許使用者建立不同的顏色配置並在它們之間切換。只要改變顏色並建立新的配置即"
+"可。可用來切換為白色背景以便在明亮的陽光下有較佳的視覺感受。請查閱 JOSM 偏好"
+"設定中的對話盒與「地圖設定值」 (有點怪但確是真的 :-)"
 
 #. Plugin Create_grid_of_ways
@@ -20253,5 +20786,7 @@
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
 "openstreetmap.org."
-msgstr "這個外掛程式可以將 JOSM 中目前使用的圖層 GPS 軌跡直接上傳至 openstreetmap.org。"
+msgstr ""
+"這個外掛程式可以將 JOSM 中目前使用的圖層 GPS 軌跡直接上傳至 openstreetmap."
+"org。"
 
 #. Plugin Duplicate-Way
@@ -20268,21 +20803,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 "在 JOSM 中直接從 Globalsat dg100 資料記錄器下載 GPS 點。"
 
 #. 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 "
@@ -20290,14 +20824,14 @@
 "the filename of an image."
 msgstr ""
-"另一個用來將圖片與 GPX "
-"檔案中的航點配對的外掛程式。配對的方式是當航點標籤的「name」、「cmt」或「desc」屬性與圖片的檔案名稱相符時就是配對成功。"
+"另一個用來將圖片與 GPX 檔案中的航點配對的外掛程式。配對的方式是當航點標籤的"
+"「name」、「cmt」或「desc」屬性與圖片的檔案名稱相符時就是配對成功。"
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:34
 msgid "Helps vectorizing WMS images."
 msgstr "協助將 WMS 圖片向量化。"
 
 #. 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."
@@ -20305,23 +20839,25 @@
 
 #. 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 "
 "segments, area surrounded by a (simple) closed way and create measurement "
 "paths (which also can be imported from a gps layer)."
-msgstr "提供測量對話盒與圖層以測量區段、由（簡單的）封閉路徑圍繞的區域的長度與角度，並建立測量路徑（也可以從 gps 圖層匯入）。"
+msgstr ""
+"提供測量對話盒與圖層以測量區段、由（簡單的）封閉路徑圍繞的區域的長度與角度，"
+"並建立測量路徑（也可以從 gps 圖層匯入）。"
 
 #. 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 "
@@ -20330,5 +20866,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 "
@@ -20336,18 +20872,19 @@
 "mouse moving (general Java - tablet problem)."
 msgstr ""
-"當您進行小且短暫的拖曳時模擬為點選動作。這對平板電腦的觸控筆很有用，當您有問題時只要點選面板而不需移動滑鼠（一般性 Java - 平板電腦問題）。"
+"當您進行小且短暫的拖曳時模擬為點選動作。這對平板電腦的觸控筆很有用，當您有問"
+"題時只要點選面板而不需移動滑鼠（一般性 Java - 平板電腦問題）。"
 
 #. Plugin openlayers
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:48
 msgid "Displays an OpenLayers background image"
 msgstr "顯示 OpenLayers 背景圖片"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:50
 msgid "Imports issues from OpenStreetBugs"
 msgstr "匯入OpenStreetBugs 的議題"
 
 #. 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"
@@ -20355,5 +20892,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."
@@ -20361,12 +20898,13 @@
 
 #. 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 "
 "right click menu of the image layer."
-msgstr "將 gps 地點資訊寫入圖片檔的檔頭。在圖片圖層按右鍵選單就可以執行這項功能。"
+msgstr ""
+"將 gps 地點資訊寫入圖片檔的檔頭。在圖片圖層按右鍵選單就可以執行這項功能。"
 
 #. 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 "
@@ -20375,10 +20913,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "超棒的 JGoodies 塑膠外觀與感覺。"
 
 #. 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."
@@ -20386,57 +20924,70 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:64
 msgid "Let other applications send commands to JOSM."
 msgstr "讓其他的應用程式傳送指令給 JOSM。"
 
 #. 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 "
 "defined in routes.xml file in plugin directory"
-msgstr "繪製路線（公車、健行路行、自行車路線等）。路線類型必須定義於外掛程式目錄的 routes.xml 檔案"
+msgstr ""
+"繪製路線（公車、健行路行、自行車路線等）。路線類型必須定義於外掛程式目錄的 "
+"routes.xml 檔案"
 
 #. 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 "
 "background and request updates."
-msgstr "在 JOSM 中顯示快速地圖格線。可以從快速地圖中載入拼貼作為背景並要求更新。"
+msgstr ""
+"在 JOSM 中顯示快速地圖格線。可以從快速地圖中載入拼貼作為背景並要求更新。"
 
 #. Plugin surveyor
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:77
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "允許在目前的 gps 位置加入標記/節點。"
 
 #. 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 "
 "tagging presets (quick preview of the dialog that will popup). You can start "
 "the jar-file as standalone as well."
-msgstr "在求助選單中加入標籤預設組合測試器，可以協助您進行標籤預設組合的開發（會彈出快速預覽對話盒）。您也可以單獨以 jar-檔案的方式啟動。"
+msgstr ""
+"在求助選單中加入標籤預設組合測試器，可以協助您進行標籤預設組合的開發（會彈出"
+"快速預覽對話盒）。您也可以單獨以 jar-檔案的方式啟動。"
 
 #. 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). "
@@ -20445,5 +20996,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) "
@@ -20452,49 +21003,57 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:89
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
 "restrictions in the OpenStreetMap database."
-msgstr "turnrestrictions 外掛程式允許將轉彎限制的維護資訊輸入到 OpenStreetMap 資料庫中。"
+msgstr ""
+"turnrestrictions 外掛程式允許將轉彎限制的維護資訊輸入到 OpenStreetMap 資料庫"
+"中。"
 
 #. Plugin undelete
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:91
 msgid "Allows undeleting object from OSM database"
 msgstr "允許從 OSM 資料庫中取消物件的刪除"
 
 #. 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 "
 "for the common ones. Spellcheck integrated for tag names."
-msgstr "OSM 資料驗證器。它會檢查資料中的問題，並提供對一般問題的修正。同時整合了對標籤名稱的拼字檢查。"
+msgstr ""
+"OSM 資料驗證器。它會檢查資料中的問題，並提供對一般問題的修正。同時整合了對標"
+"籤名稱的拼字檢查。"
 
 #. Plugin videomapping
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:95
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
 "georeferenced video against a GPS track, to use it for identify visible "
 "objects."
-msgstr "（這個外掛程式目前還在開發中！！！）連結並將地理參照的影片同步到 GPS 軌跡中，它可以用來辨識可見的物件。"
+msgstr ""
+"（這個外掛程式目前還在開發中！！！）連結並將地理參照的影片同步到 GPS 軌跡中，"
+"它可以用來辨識可見的物件。"
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:97
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
 "plugin is still under early development and may be buggy."
-msgstr "支援從 walking-papers.org 下載拼貼式、掃描好的地圖。這個外掛程式仍在開發的早期階段，因此可能有許多程式錯誤存在。"
+msgstr ""
+"支援從 walking-papers.org 下載拼貼式、掃描好的地圖。這個外掛程式仍在開發的早"
+"期階段，因此可能有許多程式錯誤存在。"
 
 #. 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 "
@@ -20503,5 +21062,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:105
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21391,10 +21950,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 "圓環"
@@ -21531,8 +22090,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"/>
@@ -21742,5 +22301,5 @@
 #. color motorroad
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21750,5 +22309,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21767,5 +22326,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21775,5 +22334,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21792,5 +22351,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -21800,5 +22359,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -21817,5 +22376,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -21825,5 +22384,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -21838,5 +22397,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -21854,8 +22413,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 "居住的"
@@ -21870,5 +22429,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -21877,5 +22436,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--public_transport tags -->
 #. <rule>
@@ -21885,10 +22444,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 "巷/弄"
@@ -21903,5 +22462,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -21910,5 +22469,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -21918,10 +22477,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 "施工"
@@ -22927,9 +23486,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 ""
@@ -23259,5 +23818,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -23267,5 +23826,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -23275,5 +23834,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -23283,5 +23842,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -23291,5 +23850,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -23299,5 +23858,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -23307,5 +23866,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -23316,5 +23875,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -23322,9 +23881,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 ""
@@ -24734,5 +25293,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24742,5 +25301,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24750,5 +25309,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24758,5 +25317,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -25120,7 +25679,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--sport tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -25130,5 +25689,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -25138,5 +25697,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -25146,5 +25705,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -25154,5 +25713,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -25162,5 +25721,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -25170,5 +25729,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -25178,5 +25737,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -25186,5 +25745,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -25194,5 +25753,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -25202,5 +25761,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -25210,5 +25769,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -25218,5 +25777,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -25226,5 +25785,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -25234,5 +25793,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -25242,5 +25801,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -25250,5 +25809,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -25258,5 +25817,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -25266,5 +25825,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -25274,5 +25833,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -25282,5 +25841,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -25290,5 +25849,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -25298,5 +25857,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -25306,5 +25865,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -25314,5 +25873,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -25322,5 +25881,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -25330,5 +25889,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -25338,5 +25897,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -25346,5 +25905,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -25354,5 +25913,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -25362,5 +25921,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -25370,5 +25929,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -25378,5 +25937,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -25386,5 +25945,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -25394,5 +25953,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -25402,5 +25961,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -25410,5 +25969,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -25418,5 +25977,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -25426,5 +25985,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -25434,5 +25993,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -25442,5 +26001,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -25450,5 +26009,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -25458,5 +26017,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -25466,5 +26025,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -25474,5 +26033,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -25482,5 +26041,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -25490,33 +26049,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 "運動"
@@ -27194,7 +27753,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--landuse tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -27204,5 +27763,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -27212,5 +27771,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -27220,5 +27779,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -27228,5 +27787,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -27236,5 +27795,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -27244,5 +27803,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -27252,5 +27811,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -27260,12 +27819,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 "綠色"
@@ -28681,5 +29240,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -28695,5 +29254,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28703,18 +29262,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 -->
@@ -28723,7 +29299,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- cycleway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28733,5 +29309,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28741,5 +29317,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28749,5 +29325,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28757,12 +29333,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 "單車"
@@ -28789,5 +29366,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -28803,5 +29380,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -28811,5 +29388,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28818,13 +29395,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"/>
@@ -28835,11 +29420,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 "步行"
@@ -28858,8 +29444,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 "地下鐵"
@@ -28971,9 +29557,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
@@ -28981,5 +29567,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,
@@ -28989,8 +29575,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
@@ -29004,5 +29590,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#. 
+#.
 #: build/trans_style.java:72
 msgid "standard"
@@ -29010,5 +29596,5 @@
 
 #. mappaint style named "standard"
-#. 
+#.
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -29057,6 +29643,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>
@@ -29136,5 +29722,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -29144,16 +29730,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 "已廢棄"
@@ -29164,5 +29750,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -29171,5 +29757,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -29178,5 +29764,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -29192,5 +29778,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -29204,5 +29790,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -29211,5 +29797,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -29218,5 +29804,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -29225,5 +29811,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -29232,5 +29818,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -29239,5 +29825,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -29246,5 +29832,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxweight"/>
@@ -29253,5 +29839,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxheight"/>
@@ -29260,5 +29846,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -29267,5 +29853,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxlength"/>
@@ -29274,5 +29860,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -29281,5 +29867,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="minspeed"/>
@@ -29288,5 +29874,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxstay"/>
@@ -29295,5 +29881,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="toll"/>
@@ -29302,5 +29888,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="barrier"/>
@@ -29477,7 +30063,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- highway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -29491,5 +30077,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -29499,7 +30085,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- tracktype tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -29509,5 +30095,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -29517,5 +30103,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -29525,5 +30111,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -29533,10 +30119,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 ""
@@ -29547,5 +30133,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -29554,5 +30140,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -29562,5 +30148,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -29569,5 +30155,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -29576,5 +30162,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -29583,5 +30169,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -29590,5 +30176,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -29597,5 +30183,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -29604,5 +30190,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -29611,5 +30197,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -29618,5 +30204,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -29625,8 +30211,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 ""
@@ -29637,8 +30223,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 ""
@@ -29649,5 +30235,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -29656,8 +30242,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 ""
@@ -29668,9 +30254,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 ""
@@ -29681,9 +30267,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 "河岸"
@@ -29694,8 +30280,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 "溪流"
@@ -29706,8 +30292,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 ""
@@ -29718,5 +30304,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29725,5 +30311,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29732,5 +30318,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29740,5 +30326,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29747,5 +30333,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29754,5 +30340,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29761,5 +30347,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29769,5 +30355,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29778,5 +30364,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -29786,7 +30372,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--man_made tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -29796,5 +30382,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -29804,5 +30390,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -29812,5 +30398,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -29821,5 +30407,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -29828,5 +30414,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -29836,5 +30422,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -29844,5 +30430,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -29852,5 +30438,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -29860,5 +30446,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -29868,5 +30454,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -29876,5 +30462,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -29884,5 +30470,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -29892,5 +30478,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -29900,18 +30486,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 ""
@@ -29921,9 +30507,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 ""
@@ -29934,7 +30520,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- railway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -29944,5 +30530,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -29951,5 +30537,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -29959,5 +30545,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -29966,5 +30552,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -29974,5 +30560,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -29982,10 +30568,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 ""
@@ -29996,5 +30582,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -30005,13 +30591,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 ""
@@ -30022,5 +30608,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -30030,5 +30616,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30041,5 +30627,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -30047,7 +30633,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 ""
@@ -30058,5 +30644,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -30065,5 +30651,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -30072,5 +30658,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -30079,7 +30665,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aeroway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -30090,9 +30676,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 ""
@@ -30103,8 +30689,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 ""
@@ -30115,5 +30701,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -30123,8 +30709,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 ""
@@ -30135,8 +30721,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 ""
@@ -30147,5 +30733,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -30154,5 +30740,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -30161,7 +30747,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aerialway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -30171,5 +30757,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -30179,5 +30765,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -30187,5 +30773,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -30195,5 +30781,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -30203,10 +30789,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 ""
@@ -30217,11 +30803,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 ""
@@ -30232,9 +30818,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 ""
@@ -30245,9 +30831,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 ""
@@ -30258,9 +30844,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 ""
@@ -30271,9 +30857,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 ""
@@ -30284,9 +30870,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 ""
@@ -30297,7 +30883,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--power tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -30307,5 +30893,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -30314,5 +30900,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -30322,5 +30908,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -30330,5 +30916,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -30338,5 +30924,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -30346,5 +30932,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -30354,5 +30940,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -30362,5 +30948,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -30370,5 +30956,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -30378,5 +30964,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -30386,5 +30972,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -30394,5 +30980,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -30402,15 +30988,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 ""
@@ -30420,9 +31006,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 ""
@@ -30433,8 +31019,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 ""
@@ -30444,7 +31030,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--leisure tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -30454,5 +31040,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -30462,5 +31048,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -30470,5 +31056,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -30478,5 +31064,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -30486,5 +31072,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -30494,5 +31080,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -30502,5 +31088,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -30510,5 +31096,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -30518,5 +31104,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -30526,5 +31112,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -30534,5 +31120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -30542,5 +31128,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -30550,5 +31136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -30558,5 +31144,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -30566,5 +31152,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -30574,17 +31160,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 ""
@@ -30594,9 +31180,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 ""
@@ -30606,7 +31192,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--amenity tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -30616,5 +31202,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -30624,5 +31210,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -30632,5 +31218,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -30640,5 +31226,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -30648,5 +31234,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -30656,5 +31242,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -30664,5 +31250,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -30672,5 +31258,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -30680,5 +31266,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -30688,14 +31274,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 ""
@@ -30705,5 +31291,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30713,5 +31299,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30721,5 +31307,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30729,5 +31315,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30737,5 +31323,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30745,5 +31331,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30753,5 +31339,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30761,5 +31347,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30769,5 +31355,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30777,5 +31363,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -30785,5 +31371,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -30793,14 +31379,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 ""
@@ -30810,5 +31396,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -30817,5 +31403,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -30825,5 +31411,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -30832,5 +31418,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -30840,5 +31426,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -30848,5 +31434,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -30856,5 +31442,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -30863,5 +31449,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -30871,5 +31457,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -30879,5 +31465,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -30887,5 +31473,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -30895,5 +31481,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -30902,5 +31488,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -30909,5 +31495,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -30916,5 +31502,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -30923,5 +31509,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -30930,5 +31516,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -30937,5 +31523,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -30944,5 +31530,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -30951,5 +31537,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -30958,5 +31544,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -30965,5 +31551,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -30972,5 +31558,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -30979,5 +31565,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -30986,5 +31572,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -30994,5 +31580,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -31002,5 +31588,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -31010,5 +31596,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -31018,5 +31604,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -31026,5 +31612,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -31034,5 +31620,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -31042,5 +31628,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -31050,5 +31636,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -31058,5 +31644,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -31067,5 +31653,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -31075,5 +31661,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -31083,5 +31669,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -31091,5 +31677,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -31099,5 +31685,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -31107,5 +31693,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -31115,5 +31701,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -31123,5 +31709,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -31131,5 +31717,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -31139,5 +31725,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -31147,5 +31733,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -31155,5 +31741,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -31163,5 +31749,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -31171,5 +31757,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -31179,5 +31765,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -31187,5 +31773,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"/>
@@ -31195,5 +31789,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -31203,5 +31797,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -31211,5 +31805,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -31219,5 +31813,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -31226,27 +31820,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 ""
@@ -31256,5 +31851,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -31264,5 +31859,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -31272,12 +31867,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 ""
@@ -31287,5 +31882,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -31295,5 +31890,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -31303,5 +31898,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -31311,5 +31906,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -31319,5 +31914,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -31327,5 +31922,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -31335,11 +31930,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 ""
@@ -31349,7 +31944,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--shop tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -31359,5 +31954,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -31367,5 +31962,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -31375,5 +31970,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -31383,5 +31978,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -31391,5 +31986,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -31399,5 +31994,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -31407,5 +32002,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -31415,5 +32010,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -31423,5 +32018,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -31431,5 +32026,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -31439,5 +32034,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -31447,5 +32042,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -31455,5 +32050,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -31463,5 +32058,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -31471,5 +32066,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -31479,5 +32074,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -31487,5 +32082,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -31495,5 +32090,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -31503,5 +32098,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -31511,5 +32106,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -31519,5 +32114,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -31527,5 +32122,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -31535,5 +32130,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -31543,5 +32138,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -31551,5 +32146,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -31559,5 +32154,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -31567,5 +32162,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -31575,5 +32170,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -31583,5 +32178,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -31591,5 +32186,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -31599,5 +32194,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -31607,5 +32202,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -31615,5 +32210,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -31623,5 +32218,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -31631,5 +32226,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -31639,5 +32234,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -31647,5 +32242,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -31655,5 +32250,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -31663,5 +32258,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -31671,5 +32266,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -31679,5 +32274,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -31687,31 +32282,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 ""
@@ -31721,7 +32316,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--tourism tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31731,5 +32326,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31739,5 +32334,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31747,5 +32342,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31755,5 +32350,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31763,5 +32358,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31771,5 +32366,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31779,12 +32374,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 "旅館"
@@ -31794,5 +32389,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -31802,5 +32397,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -31810,5 +32405,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -31818,5 +32413,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -31826,5 +32421,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -31834,5 +32429,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -31843,5 +32438,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -31851,5 +32446,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- information tags -->
 #. <rule>
@@ -31859,5 +32454,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -31867,5 +32462,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -31874,5 +32469,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -31881,13 +32476,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 ""
@@ -31897,7 +32492,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--historic tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -31907,5 +32502,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -31915,5 +32510,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -31923,5 +32518,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -31931,5 +32526,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -31939,5 +32534,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -31947,5 +32542,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -31955,5 +32550,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -31963,5 +32558,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -31971,13 +32566,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 ""
@@ -31987,8 +32582,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 ""
@@ -31999,8 +32594,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 ""
@@ -32011,5 +32606,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -32019,8 +32614,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 ""
@@ -32031,8 +32626,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 ""
@@ -32043,6 +32638,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
-#. 
+#.
+#.
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -32052,8 +32647,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 ""
@@ -32064,8 +32659,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 ""
@@ -32076,8 +32671,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 ""
@@ -32088,8 +32683,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 ""
@@ -32100,8 +32695,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 ""
@@ -32112,5 +32707,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -32120,7 +32715,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--military tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -32130,5 +32725,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -32138,5 +32733,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -32146,5 +32741,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -32154,11 +32749,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 ""
@@ -32169,8 +32764,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 ""
@@ -32180,8 +32775,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 ""
@@ -32192,9 +32787,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 ""
@@ -32204,9 +32799,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 "火山"
@@ -32216,5 +32811,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -32225,5 +32820,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -32233,5 +32828,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -32241,5 +32836,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -32249,5 +32844,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -32257,12 +32852,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 ""
@@ -32272,9 +32867,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 ""
@@ -32284,9 +32879,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 ""
@@ -32296,9 +32891,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 "樹林區"
@@ -32308,9 +32903,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 ""
@@ -32320,9 +32915,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 "海灘"
@@ -32333,5 +32928,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?
@@ -32357,5 +32952,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -32366,11 +32961,11 @@
 #. </rule>
 #. -->
-#. 
+#.
 #. <!--name tags -->
-#. 
+#.
 #. <!--preferences tags -->
-#. 
+#.
 #. <!--place tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -32380,5 +32975,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -32388,5 +32983,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -32396,5 +32991,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -32404,5 +32999,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -32412,5 +33007,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -32420,5 +33015,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -32428,5 +33023,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -32436,5 +33031,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -32444,5 +33039,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -32452,5 +33047,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -32460,5 +33055,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -32468,15 +33063,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 ""
@@ -32486,9 +33081,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 ""
@@ -32579,5 +33174,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#. 
+#.
 #. Data type can be:
 #. node        - a node point
@@ -32585,28 +33180,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
@@ -32721,5 +33316,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#. 
+#.
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32732,5 +33327,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>
@@ -32755,6 +33350,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#. 
-#. 
+#.
+#.
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32763,6 +33358,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#. 
-#. 
+#.
+#.
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32777,6 +33372,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
@@ -32790,6 +33385,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
@@ -32809,6 +33404,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#. 
-#. 
+#.
+#.
 #. only for Japan
 #: build/trans_wms.java:39
@@ -32832,6 +33427,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
@@ -32844,4 +33439,12 @@
 msgstr ""
 
+#~ 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 ""
+#~ "id {0} 版本 {1} 的目標物件是可視的，但是來源物件 (較低版本 {2}) 是隱藏的。"
+#~ "不能處理這個不一致的情形。保留目標物件。 "
+
 #~ msgid "Open in Browser"
 #~ msgstr "在瀏覽器中打開"
@@ -32866,6 +33469,6 @@
 
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want to "
-#~ "combine them?"
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
 #~ msgstr "選取的路徑有不同的關係成員。是否仍要將它們組合？"
 
@@ -32879,5 +33482,4 @@
 #~ msgstr "只能在 JOSM 線上求助中編輯求助頁面"
 
-#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "載入頁面 {0} 時發生錯誤"
@@ -32890,6 +33492,6 @@
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still want "
-#~ "to merge them?"
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
 #~ msgstr "選取的節點有不同的關係成員。是否仍要合併它們？"
 
@@ -32910,6 +33512,6 @@
 
 #~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this as "
-#~ "a bug."
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
 #~ msgstr "內部的錯誤：不能檢查無圖層的條件。請將它回報為程式錯誤。"
 
@@ -32918,5 +33520,6 @@
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data layer?"
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
 #~ msgstr "找不到要更新的資料。您是否已經開啟或下載過資料圖層？"
 
@@ -32951,9 +33554,7 @@
 #~ msgstr "與伺服器連線時發生錯誤。"
 
-#, java-format
 #~ msgid "Parsing error in URL: \"{0}\""
 #~ msgstr "URL 解析錯誤：「{0}」"
 
-#, java-format
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "無法讀取 URL：「{0}」"
@@ -32963,8 +33564,10 @@
 
 #~ msgid ""
-#~ "You are about to delete nodes outside of the area you have "
-#~ "downloaded.<br>This can cause problems because other objects (that you don't "
-#~ "see) might use them.<br>Do you really want to delete?"
-#~ msgstr "您將要刪除在下載的區域外的節點。<br>這樣有時會發生問題，因為其他物件（您沒有看到的）可能會使用它們。<br>確定要刪除嗎？"
+#~ "You are about to delete nodes outside of the area you have downloaded."
+#~ "<br>This can cause problems because other objects (that you don't see) "
+#~ "might use them.<br>Do you really want to delete?"
+#~ msgstr ""
+#~ "您將要刪除在下載的區域外的節點。<br>這樣有時會發生問題，因為其他物件（您沒"
+#~ "有看到的）可能會使用它們。<br>確定要刪除嗎？"
 
 #~ msgid "Move"
@@ -32977,11 +33580,11 @@
 #~ msgstr "給 nodes 運算子錯誤的參數數量。"
 
-#, java-format
 #~ msgid ""
 #~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
 #~ "nodes or range, for example nodes:10-20"
-#~ msgstr "nodes 運算子的數值錯誤：{0}。nodes 運算子應使用節點的數量或範圍，例如 nodes:10-20"
-
-#, java-format
+#~ msgstr ""
+#~ "nodes 運算子的數值錯誤：{0}。nodes 運算子應使用節點的數量或範圍，例如 "
+#~ "nodes:10-20"
+
 #~ msgid "Incorrect value of id operator: {0}. Number is expected."
 #~ msgstr "id 運算子數值錯誤：{0}。應使用數字。"
@@ -32999,9 +33602,7 @@
 #~ msgstr "區域類型的路徑並未封閉。"
 
-#, java-format
 #~ msgid "multipolygon way ''{0}'' is not closed."
 #~ msgstr "多邊形路徑「{0}」並未封閉。"
 
-#, java-format
 #~ msgid "Way ''{0}'' with less than two points."
 #~ msgstr "路徑「{0}」少於兩個節點。"
@@ -33016,25 +33617,19 @@
 #~ msgstr "找到一個以上「經過」路徑。"
 
-#, java-format
 #~ msgid "No useful role ''{0}'' for Way ''{1}''."
 #~ msgstr "路徑「{1}」沒有有用的角色「{0}」。"
 
-#, java-format
 #~ msgid "Non-Way ''{0}'' in multipolygon."
 #~ msgstr "多邊形中有非-路徑「{0}」。"
 
-#, java-format
 #~ msgid "No outer way for multipolygon ''{0}''."
 #~ msgstr "多邊形「{0}」沒有外部路徑。"
 
-#, java-format
 #~ msgid "Inner way ''{0}'' is outside."
 #~ msgstr "內部路徑「{0}」在外。"
 
-#, java-format
 #~ msgid "Style for inner way ''{0}'' equals multipolygon."
 #~ msgstr "內部路徑「{0}」的樣式等同多邊形。"
 
-#, java-format
 #~ msgid "Style for outer way ''{0}'' mismatches."
 #~ msgstr "外部路徑「{0}」的樣式不符。"
@@ -33060,5 +33655,6 @@
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you load\n"
+#~ "Parameters are read in the order they are specified, so make sure you "
+#~ "load\n"
 #~ "some data before --selection"
 #~ msgstr ""
@@ -33078,5 +33674,4 @@
 #~ msgstr "正在合併衝突。"
 
-#, java-format
 #~ msgid "Layers: {0}"
 #~ msgstr "圖層：{0}"
@@ -33113,5 +33708,4 @@
 #~ msgstr[0] "圖片"
 
-#, java-format
 #~ msgid "The date in file \"{0}\" could not be parsed."
 #~ msgstr "檔案「{0}」的日期無法解析。"
@@ -33129,5 +33723,4 @@
 #~ msgstr "登入"
 
-#, java-format
 #~ msgid "There is no EXIF time within the file \"{0}\"."
 #~ msgstr "在檔案「{0}」中沒有 EXIF 時刻。"
@@ -33145,17 +33738,13 @@
 #~ msgstr "讀取 GPX 時建立非音效標記。"
 
-#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "連接 {0}..."
 
-#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "不能開啓偏好設定目錄：{0}"
 
-#, java-format
 #~ msgid "Error: {0}"
 #~ msgstr "錯誤：{0}"
 
-#, java-format
 #~ msgid "Warning: {0}"
 #~ msgstr "警告：{0}"
@@ -33170,13 +33759,10 @@
 #~ msgstr "找不到「到」路徑。"
 
-#, java-format
 #~ msgid "Unknown role ''{0}''."
 #~ msgstr "不明的角色「{0}」。"
 
-#, java-format
 #~ msgid "Unknown member type for ''{0}''."
 #~ msgstr "「{0}」的不明成員類型。"
 
-#, java-format
 #~ msgid "Intersection between ways ''{0}'' and ''{1}''."
 #~ msgstr "路徑「{0}」和「{1}」之間的十字路。"
@@ -33188,5 +33774,4 @@
 #~ msgstr "參數「{0}」不能為空值(null)"
 
-#, java-format
 #~ msgid "Style for restriction {0} not found."
 #~ msgstr "找不到限制 {0} 的樣式"
@@ -33195,5 +33780,4 @@
 #~ msgstr "套用部分解決方案"
 
-#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "指令堆疊：{0}"
@@ -33205,5 +33789,4 @@
 #~ msgstr "編輯屬性"
 
-#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "作者：{0}"
@@ -33215,5 +33798,4 @@
 #~ msgstr "移陳選取的"
 
-#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "關係編輯器：{0}"
@@ -33246,13 +33828,10 @@
 #~ msgstr "x 軸"
 
-#, java-format
 #~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
 #~ msgstr "不能讀取點 {1} x {2} 的時刻「{0}」"
 
-#, java-format
 #~ msgid "No time for point {0} x {1}"
 #~ msgstr "點 {0} x {1} 沒有時刻"
 
-#, java-format
 #~ msgid "Images for {0}"
 #~ msgstr "{0} 的圖片"
@@ -33261,13 +33840,10 @@
 #~ msgstr "讀取 GPX..."
 
-#, java-format
 #~ msgid "GPS start: {0}"
 #~ msgstr "GPS 開始：{0}"
 
-#, java-format
 #~ msgid "GPS end: {0}"
 #~ msgstr "GPS 結束：{0}"
 
-#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} 在此軌跡中。"
@@ -33304,5 +33880,4 @@
 #~ msgstr "載入選擇區域"
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -33318,5 +33893,4 @@
 #~ "看到此訊息後請勿上傳任何資料。"
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -33344,6 +33918,6 @@
 #~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
 #~ msgstr ""
-#~ "標籤預設組合定義檔案的來源（URL 或檔案名稱）。請查閱 "
-#~ "http://josm.openstreetmap.de/wiki/TaggingPresets 的說明。"
+#~ "標籤預設組合定義檔案的來源（URL 或檔案名稱）。請查閱 http://josm."
+#~ "openstreetmap.de/wiki/TaggingPresets 的說明。"
 
 #~ msgid "Add a new tagging preset source to the list."
@@ -33398,5 +33972,4 @@
 #~ msgstr "分析時發生錯誤。"
 
-#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -33411,18 +33984,15 @@
 #~ msgstr "更新外掛程式"
 
-#, java-format
 #~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
 #~ msgstr "關係 {1} 的成員 {0} 有未預期的「type」，得到 {2}。"
 
 #~ 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 "啓用更新的外掛程式失敗。請檢查 JOSM 是否有覆蓋既存項目的權限。"
 
-#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "找不到外掛程式：{0}。"
 
-#, java-format
 #~ msgid "Plugin {0} requires JOSM update to version {1}."
 #~ msgstr "外掛程式 {0} 要求 JOSM 更新到 {1} 版。"
@@ -33436,5 +34006,7 @@
 #~ "(You can change the number of days after which this warning appears<br>by "
 #~ "setting the config option 'pluginmanager.warntime'.)"
-#~ msgstr "(您可以設定這個警告每隔幾天出現，<br>只要設定選項「pluginmanager.warntime」。)"
+#~ msgstr ""
+#~ "(您可以設定這個警告每隔幾天出現，<br>只要設定選項「pluginmanager."
+#~ "warntime」。)"
 
 #~ msgid "More details"
@@ -33447,5 +34019,4 @@
 #~ msgstr "在非-關係中發現 <member> 元件。"
 
-#, java-format
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr "忽略路徑，因為它包含不存在的節點：{0}\n"
@@ -33455,6 +34026,6 @@
 
 #~ 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 "在回報錯誤前請先試著更新到最新版的 JOSM 與所有外掛程式。"
 
@@ -33472,9 +34043,7 @@
 #~ msgstr "圖片沒有 exif 位置"
 
-#, java-format
 #~ msgid "Found {0} matches of {1} in GPX track {2}"
 #~ msgstr "在 GPX 軌跡 {2} 中找到 {1} 的 {0} 個符合項"
 
-#, java-format
 #~ msgid "Offset between track and photos: {0}m {1}s"
 #~ msgstr "在軌跡與相片間的補償：{0}分 {1}秒"
@@ -33513,8 +34082,9 @@
 #~ "確定要繼續嗎？"
 
-#, java-format
-#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
+#~ msgid ""
+#~ "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them all?"
+#~ "The selection contains {0} ways. Are you sure you want to simplify them "
+#~ "all?"
 #~ msgstr[0] "選擇區域包含 {0} 條路徑。確定要全部簡化？"
 
@@ -33522,9 +34092,7 @@
 #~ msgstr "檢驗目前的選擇區域或整個資料組合。"
 
-#, java-format
 #~ msgid "current delta: {0}s"
 #~ msgstr "目前的差分： {0}秒"
 
-#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "請在 {0} 回報為 ticket"
@@ -33533,9 +34101,7 @@
 #~ msgstr "AgPifoJ - 有 Geotag 的相片"
 
-#, java-format
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "使用群組「{1}」的預設組合「{0}」"
 
-#, java-format
 #~ msgid "Use preset ''{0}''"
 #~ msgstr "使用預設組合「{0}」"
@@ -33553,5 +34119,4 @@
 #~ msgstr "蘭勃特區 2 快取檔案 (.2)"
 
-#, java-format
 #~ msgid "Change the projection to {0} first."
 #~ msgstr "先將投影改變為 {0}。"
@@ -33593,7 +34158,4 @@
 #~ msgstr "開啟使用者頁面"
 
-#~ msgid "Are you sure?"
-#~ msgstr "您確定嗎？"
-
 #~ msgid "Painting problem"
 #~ msgstr "繪圖問題"
@@ -33612,6 +34174,6 @@
 
 #~ msgid ""
-#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
-#~ "these will then show up in the WMS menu.\n"
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
+#~ "- these will then show up in the WMS menu.\n"
 #~ "\n"
 #~ "You can also do this manually in the Advanced Preferences, using the "
@@ -33627,6 +34189,6 @@
 #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
 #~ "only need to input the relevant 'id'.\n"
-#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in "
-#~ "this example, replacing 73 with your image id:\n"
+#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
+#~ "in this example, replacing 73 with your image id:\n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -33635,5 +34197,6 @@
 #~ "use."
 #~ msgstr ""
-#~ "您可以在 WMSplugin 偏好設定分頁中加入、編輯和刪除 WMS 項目 - 然後這些就會在 WMS 選單中顯示出來。\n"
+#~ "您可以在 WMSplugin 偏好設定分頁中加入、編輯和刪除 WMS 項目 - 然後這些就會"
+#~ "在 WMS 選單中顯示出來。\n"
 #~ "\n"
 #~ "您也可以在進階偏好設定中手動完成它，使用下列配置：\n"
@@ -33646,6 +34209,8 @@
 #~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
 #~ "\n"
-#~ "以 Metacarta 的地圖修正器 http://labs.metacarta.com/rectifier/ 來說，您只需要輸入相對的「id」。\n"
-#~ "要加入 Metacarta 地圖修正器選單項目，手動建立如這個範例的 URL，並將 73 換成您的圖片 id：\n"
+#~ "以 Metacarta 的地圖修正器 http://labs.metacarta.com/rectifier/ 來說，您只"
+#~ "需要輸入相對的「id」。\n"
+#~ "要加入 Metacarta 地圖修正器選單項目，手動建立如這個範例的 URL，並將 73 換"
+#~ "成您的圖片 id：\n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -33662,5 +34227,7 @@
 #~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
 #~ "import EXIF geotagged pictures."
-#~ msgstr "JOSM 的另一個 geotag 外掛程式。將相片與 GPS 軌跡關聯或匯入 EXIF 已有 geotag 的相片。"
+#~ msgstr ""
+#~ "JOSM 的另一個 geotag 外掛程式。將相片與 GPS 軌跡關聯或匯入 EXIF 已有 "
+#~ "geotag 的相片。"
 
 #~ msgid "Directly load TCX files from JOSM."
@@ -33668,12 +34235,15 @@
 
 #~ msgid ""
-#~ "Tools to work with authors/users. Selects map data that belongs to selected "
-#~ "user, opens browser showing selected author profile page."
-#~ msgstr "與作者/使用者相關的工具。選擇屬於選取的使用者的地圖資料，開啟瀏覽器顯示選取的作者個人資料頁面。"
+#~ "Tools to work with authors/users. Selects map data that belongs to "
+#~ "selected user, opens browser showing selected author profile page."
+#~ msgstr ""
+#~ "與作者/使用者相關的工具。選擇屬於選取的使用者的地圖資料，開啟瀏覽器顯示選"
+#~ "取的作者個人資料頁面。"
 
 #~ msgid ""
-#~ "Several utilities that make your life easier: e.g. simplify way, join areas, "
-#~ "jump to position."
-#~ msgstr "許多能讓您的生活更輕鬆的公用程式：例如簡化路徑、連結區域、跳至位置。"
+#~ "Several utilities that make your life easier: e.g. simplify way, join "
+#~ "areas, jump to position."
+#~ msgstr ""
+#~ "許多能讓您的生活更輕鬆的公用程式：例如簡化路徑、連結區域、跳至位置。"
 
 #~ msgid "Boat"
@@ -33782,31 +34352,26 @@
 #~ msgstr "編輯艱難的高山健行"
 
-#, java-format
 #~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr "求助頁面遺失。以 <A HREF=\"{0}\">English</A> 建立它。"
 
-#, java-format
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">your language</A>."
-#~ msgstr "求助頁面遺失。以 <A HREF=\"{0}\">English</A> 或 <A HREF=\"{1}\">您的語言</A>建立它。"
-
-#, java-format
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "求助頁面遺失。以 <A HREF=\"{0}\">English</A> 或 <A HREF=\"{1}\">您的語言</"
+#~ "A>建立它。"
+
 #~ msgid "Parameter ''{0}'' must not be null."
 #~ msgstr "參數「{0}」必須不為空值(null)"
 
-#, java-format
 #~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 #~ msgstr "預期為 OsmDataLayer 或 GpxLayer 的實體。卻取得「{0}」。"
 
-#, java-format
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "未預期的回傳值。得到 {0}"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
 #~ msgstr "參數「{0}」應為 > 0，得到「{1}」"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 #~ msgstr "參數「{0}」不是可接受的類別，取得「{1}」"
@@ -33815,5 +34380,4 @@
 #~ msgstr "在這個歷史紀錄日期「{0}」沒有有效的版本"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 #~ msgstr "參數「{0}」應使用範圍 0..{1}，卻收到 {2}"
@@ -33825,25 +34389,19 @@
 #~ msgstr "找不到最新的版本。歷史紀錄是空的。"
 
-#, java-format
 #~ msgid "Parameter current out of range. Got {0}."
 #~ msgstr "參數目前超出範圍：得到 {0}"
 
-#, java-format
 #~ msgid "Unexpected column index. Got {0}."
 #~ msgstr "未預期的欄位索引。得到 {0}"
 
-#, java-format
 #~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
 #~ msgstr "參數「col」必須為 0 或 1。卻得到 {0}"
 
-#, java-format
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "不能讀取 \"{0}\""
 
-#, java-format
 #~ msgid "Id > 0 required, got {0}"
 #~ msgstr "需要 Id > 0，卻收到 {0}"
 
-#, java-format
 #~ msgid ""
 #~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
@@ -33854,5 +34412,4 @@
 #~ msgstr "永遠進行移動而不要顯示這個對話盒"
 
-#, java-format
 #~ msgid ""
 #~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
@@ -33862,5 +34419,4 @@
 #~ msgstr "至少要刪除一個物件，卻收到空白集合"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' must not be empty"
 #~ msgstr "參數「{0}」不能空白"
@@ -33872,17 +34428,13 @@
 #~ msgstr "在 n.getEastNorth() 有未預期的空值(null)。n 的 id 為"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
 #~ msgstr "預期參數「{0}」> 0.0，卻收到 {1}"
 
-#, java-format
 #~ msgid "Expected array of length 4, got {0}"
 #~ msgstr "預期的陣列長度為 4，卻收到 {0}"
 
-#, java-format
 #~ msgid "Uploading {0} objects ..."
 #~ msgstr "正在上傳 {0} 個物件..."
 
-#, java-format
 #~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
 #~ msgstr "樣式語法錯誤：在 {1} 中的樣式 {0} 是無效的！"
@@ -33891,11 +34443,11 @@
 #~ msgstr "標籤運算子的參數編號錯誤。"
 
-#, java-format
 #~ msgid ""
-#~ "Incorrect value of tags operator: {0}. Tags operator expects number of tags "
-#~ "or range, for example tags:1 or tags:2-5"
-#~ msgstr "標籤運算子的數值不正確：{0}。標籤運算子預期的是標籤的編號或一個範圍，例如 tags:1 或 tags:2-5"
-
-#, java-format
+#~ "Incorrect value of tags operator: {0}. Tags operator expects number of "
+#~ "tags or range, for example tags:1 or tags:2-5"
+#~ msgstr ""
+#~ "標籤運算子的數值不正確：{0}。標籤運算子預期的是標籤的編號或一個範圍，例如 "
+#~ "tags:1 或 tags:2-5"
+
 #~ msgid ""
 #~ "Current number of changes exceeds the max. number of changes, current is "
@@ -33903,9 +34455,7 @@
 #~ msgstr "目前的變更數超過最大值。變更的數量，目前為 {0}，最大值為 {1}"
 
-#, java-format
 #~ msgid "Failed to load load resource ''{0}''. Error is {1}"
 #~ msgstr "無法讀取載入資源「{0}」。錯誤為 {1}"
 
-#, java-format
 #~ msgid "Expected ID >= 0. Got {0}."
 #~ msgstr "預期 ID >= 0。收到 {0}。"
@@ -33914,21 +34464,19 @@
 #~ msgstr "發現同一 uid 的使用者但姓名卻不同"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
 #~ msgstr "預期參數「{0}」> 0，卻收到 {1}"
 
 #~ msgid ""
-#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
-#~ "the following\n"
+#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to "
+#~ "add the following\n"
 #~ "      Java option to increase the maximum size of allocated memory"
 #~ msgstr ""
-#~ "注意：在大多數工作中，JOSM 需要很多記憶體認出人意外。如果有需要可以加入下列\n"
+#~ "注意：在大多數工作中，JOSM 需要很多記憶體認出人意外。如果有需要可以加入下"
+#~ "列\n"
 #~ "      Java 選項來增加分配記憶體的最大容量"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' must not be empty."
 #~ msgstr "參數「{0}」不能為空白。"
 
-#, java-format
 #~ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 #~ msgstr "標籤的參數「{0}」只能有一個鍵值。卻收到 {1}。"
@@ -33943,15 +34491,15 @@
 #~ msgstr "正在更新原型"
 
-#, java-format
 #~ msgid ""
 #~ "<html>There are {0} primitives in your local dataset which<br>might be "
 #~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
-#~ "to check the state of these primitives<br>on the server.<br>Click "
+#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
+#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
 #~ "<strong>{2}</strong> to ignore.<br></html>"
 #~ msgstr ""
-#~ "<html>在您的本地端資料組合中有 {0} "
-#~ "個原型可能在<br>伺服器上被刪除了。如果您稍後想刪除或更新它們，<br>伺服器可能會回報發生<br>衝突。<br><br>點選<strong>{1}</"
-#~ "strong> 以檢查這些原型在伺服器上<br>的狀態。<br>點選 <strong>{2}</strong> 則會略過它。<br></html>"
+#~ "<html>在您的本地端資料組合中有 {0} 個原型可能在<br>伺服器上被刪除了。如果"
+#~ "您稍後想刪除或更新它們，<br>伺服器可能會回報發生<br>衝突。<br><br>點選"
+#~ "<strong>{1}</strong> 以檢查這些原型在伺服器上<br>的狀態。<br>點選 <strong>"
+#~ "{2}</strong> 則會略過它。<br></html>"
 
 #~ msgid "Deleted or moved primitives"
@@ -33964,5 +34512,4 @@
 #~ msgstr "對話盒尚未建立。先呼叫 createInstance()"
 
-#, java-format
 #~ msgid ""
 #~ "<html>Failed to create an URL because the encoding ''{0}'' was<br>was "
@@ -33971,73 +34518,74 @@
 
 #~ msgid ""
-#~ "<html>The merged nodes are members in one ore more relations. Please decide "
-#~ "whether your want to <strong>keep</strong> these memberships for the target "
-#~ "node or whether you want to <strong>remove</strong> them.<br>The default is "
-#~ "to <strong>keep</strong> them: the target node will take the place of the "
-#~ "original node in the membership.</html>"
+#~ "<html>The merged nodes are members in one ore more relations. Please "
+#~ "decide whether your want to <strong>keep</strong> these memberships for "
+#~ "the target node or whether you want to <strong>remove</strong> them."
+#~ "<br>The default is to <strong>keep</strong> them: the target node will "
+#~ "take the place of the original node in the membership.</html>"
 #~ msgstr ""
-#~ "<html>合併的節點是一或多個關係的成員。請決定您要 <strong>保留</strong> 目標節點的這些成員屬性或是要 "
-#~ "<strong>移除</strong> 它們。<br>預設值是 <strong>保留</strong> "
-#~ "它們：目標節點將會取代原本成員中節點的位置。</html>"
+#~ "<html>合併的節點是一或多個關係的成員。請決定您要 <strong>保留</strong> 目"
+#~ "標節點的這些成員屬性或是要 <strong>移除</strong> 它們。<br>預設值是 "
+#~ "<strong>保留</strong> 它們：目標節點將會取代原本成員中節點的位置。</html>"
 
 #~ msgid "Conflicts in data"
 #~ msgstr "衝突發生於資料"
 
-#, java-format
 #~ msgid ""
-#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal to "
-#~ "deleting the roles of these primitives.<br>Do you really want to apply the "
-#~ "new role?</html>"
-#~ msgstr "<html>您正在 {0} 原型上設定空角色。<br>這個動作等於要刪除這些原型的角色。<br>您確定要套用此新角色嗎？</html>"
-
-#, java-format
+#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
+#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
+#~ "the new role?</html>"
+#~ msgstr ""
+#~ "<html>您正在 {0} 原型上設定空角色。<br>這個動作等於要刪除這些原型的角色。"
+#~ "<br>您確定要套用此新角色嗎？</html>"
+
 #~ msgid "Incorrect value of changeset operator: {0}. Number is expected."
 #~ msgstr "變更組合運算子的數值不正確：{0}。須使用數字。"
 
-#, java-format
 #~ msgid "{0} Plugin successfully downloaded."
 #~ msgid_plural "{0} Plugins successfully downloaded."
 #~ msgstr[0] "{0} 個外掛程式下載成功。"
 
-#, java-format
 #~ msgid "Warning: no preference ''{0}'' found. Will use no proxy."
 #~ msgstr "警告：找不到偏好設定「{0}」。將不使用代理伺服器。"
 
-#, java-format
 #~ msgid ""
 #~ "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
 #~ "''{1}''. Proxy won't be used"
-#~ msgstr "警告：未預期的 HTTP 代理伺服器參數。得到主機「{0}」和連接埠「{1}」。將不使用代理伺服器"
-
-#, java-format
+#~ msgstr ""
+#~ "警告：未預期的 HTTP 代理伺服器參數。得到主機「{0}」和連接埠「{1}」。將不使"
+#~ "用代理伺服器"
+
 #~ msgid ""
 #~ "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
 #~ "''{1}''. Proxy won't be used"
-#~ msgstr "警告：未預期的 SOCKS 代理伺服器參數。得到主機「{0}」和連接埠「{1}」。將不使用代理伺服器"
-
-#, java-format
+#~ msgstr ""
+#~ "警告：未預期的 SOCKS 代理伺服器參數。得到主機「{0}」和連接埠「{1}」。將不"
+#~ "使用代理伺服器"
+
 #~ msgid ""
 #~ "Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used."
-#~ msgstr "在偏好設定「{0}」中連接埠號碼是無效的。得到的數值是「{1}」。將不使用代理伺服器。"
-
-#, java-format
+#~ msgstr ""
+#~ "在偏好設定「{0}」中連接埠號碼是無效的。得到的數值是「{1}」。將不使用代理伺"
+#~ "服器。"
+
 #~ msgid ""
 #~ "Unexpected format for port number in in preference ''{0}''. Got ''{1}''. "
 #~ "Proxy won't be used."
-#~ msgstr "在偏好設定「{0}」中連接埠號碼的格式不正確。得到的數值是「{1}」。將不使用代理伺服器。"
-
-#, java-format
+#~ msgstr ""
+#~ "在偏好設定「{0}」中連接埠號碼的格式不正確。得到的數值是「{1}」。將不使用代"
+#~ "理伺服器。"
+
 #~ msgid "Parameter ''{0}'' >= 0 expected, got {1}"
 #~ msgstr "預期參數 ''{0}'' >= 0，卻收到 {1}"
 
-#, java-format
 #~ msgid "Value of child.getId() > 0 expected. Got {1}."
 #~ msgstr "預期的數值為 child.getId() > 0。卻得到 {1}。"
 
-#, java-format
 #~ msgid ""
-#~ "<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-#~ "network problem, please check your<br>your internet connection</html>"
-#~ msgstr "<html>無法在 {0} 開啟求助頁面。<br>這大部分是網路的問題造成的，請檢查您的<br>網際網路連線</html>"
+#~ "<html>Failed to open help page for url {0}.<br>This is most likely due to "
+#~ "a network problem, please check your<br>your internet connection</html>"
+#~ msgstr ""
+#~ "<html>無法在 {0} 開啟求助頁面。<br>這大部分是網路的問題造成的，請檢查您的"
+#~ "<br>網際網路連線</html>"
 
 #~ msgid ""
@@ -34046,6 +34594,6 @@
 #~ "Hold left mousebutton and draw a frame."
 #~ msgstr ""
-#~ "<b>縮放：:</b> 滑鼠滾輪、雙擊或 Ctrl + Up/Down <b>移動地圖：</b> 按住滑鼠右鍵並移動滑鼠或使用方向鍵。 "
-#~ "<b>選擇：</b>按住滑鼠左鍵並繪出一個方格。"
+#~ "<b>縮放：:</b> 滑鼠滾輪、雙擊或 Ctrl + Up/Down <b>移動地圖：</b> 按住滑鼠"
+#~ "右鍵並移動滑鼠或使用方向鍵。 <b>選擇：</b>按住滑鼠左鍵並繪出一個方格。"
 
 #~ msgid "The \"from\" way does not start or end at a \"via\" node."
